From bc697230a8cad013da90130ba9f81adc5300ec46 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Tue, 25 Jun 2024 09:47:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E8=B7=9F=E8=B8=AAcompone?= =?UTF-8?q?nts.d.ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/components.d.ts | 197 -------------------------------------- 1 file changed, 197 deletions(-) delete mode 100644 src/types/components.d.ts diff --git a/src/types/components.d.ts b/src/types/components.d.ts deleted file mode 100644 index aa44efde3..000000000 --- a/src/types/components.d.ts +++ /dev/null @@ -1,197 +0,0 @@ -/* eslint-disable */ -/* prettier-ignore */ -// @ts-nocheck -// Generated by unplugin-vue-components -// Read more: https://github.com/vuejs/core/pull/3399 -import '@vue/runtime-core' - -export {} - -declare module '@vue/runtime-core' { - export interface GlobalComponents { - AceDrawer: typeof import('./../components/DesignForm/aceDrawer.vue')['default'] - AddNode: typeof import('./../components/workflow/addNode.vue')['default'] - App: typeof import('./../components/DesignForm/app/index.vue')['default'] - AppMenuSvgPage: typeof import('./../components/IconSelect/appMenuSvgPage.vue')['default'] - ApproverDrawer: typeof import('./../components/workflow/drwer/approverDrawer.vue')['default'] - BianXian: typeof import('./../components/DesignForm/designLayout/bianXian.vue')['default'] - Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] - ChildTable: typeof import('./../components/DesignForm/public/form/childTable.vue')['default'] - ConditionDrawer: typeof import('./../components/workflow/drwer/conditionDrawer.vue')['default'] - CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default'] - DesignLayoutButPage: typeof import('./../components/DesignForm/designLayout/designLayoutButPage.vue')['default'] - DesignLayoutPage: typeof import('./../components/DesignForm/designLayout/designLayoutPage.vue')['default'] - DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] - DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default'] - 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'] - ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] - ElButton: typeof import('element-plus/es')['ElButton'] - ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] - 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'] - ElCollapse: typeof import('element-plus/es')['ElCollapse'] - ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] - ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] - ElContainer: typeof import('element-plus/es')['ElContainer'] - ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] - ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] - ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] - ElDialog: typeof import('element-plus/es')['ElDialog'] - ElDivider: typeof import('element-plus/es')['ElDivider'] - ElDrawer: typeof import('element-plus/es')['ElDrawer'] - ElDropdown: typeof import('element-plus/es')['ElDropdown'] - ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] - ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] - ElForm: typeof import('element-plus/es')['ElForm'] - ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElHeader: typeof import('element-plus/es')['ElHeader'] - ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] - 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'] - ElOption: typeof import('element-plus/es')['ElOption'] - 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'] - ElResult: typeof import('element-plus/es')['ElResult'] - 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'] - ElSteps: typeof import('element-plus/es')['ElSteps'] - ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] - ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTabPane: typeof import('element-plus/es')['ElTabPane'] - ElTabs: typeof import('element-plus/es')['ElTabs'] - ElTag: typeof import('element-plus/es')['ElTag'] - ElText: typeof import('element-plus/es')['ElText'] - ElTimeline: typeof import('element-plus/es')['ElTimeline'] - 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'] - EmployeesDialog: typeof import('./../components/workflow/dialog/employeesDialog.vue')['default'] - EmployeesRoleDialog: typeof import('./../components/workflow/dialog/employeesRoleDialog.vue')['default'] - ErrorDialog: typeof import('./../components/workflow/dialog/errorDialog.vue')['default'] - FlexBox: typeof import('./../components/DesignForm/public/form/flexBox.vue')['default'] - Flow: typeof import('./../components/DesignForm/public/form/components/flow.vue')['default'] - Form: typeof import('./../components/DesignForm/public/form/form.vue')['default'] - Form2: typeof import('./../components/DesignForm/public/form/form2.vue')['default'] - FormControlAttr: typeof import('./../components/DesignForm/formControlAttr.vue')['default'] - FormControlAttr_2024024: typeof import('./../components/DesignForm/formControlAttr_2024024.vue')['default'] - FormControlAttres: typeof import('./../components/DesignForm/formControlAttres.vue')['default'] - FormControlProperties: typeof import('./../components/DesignForm/formControlProperties.vue')['default'] - FormControlPropertiNew: typeof import('./../components/DesignForm/formControlPropertiNew.vue')['default'] - FormGroup: typeof import('./../components/DesignForm/public/form/formGroup.vue')['default'] - FormGroup1: typeof import('./../components/DesignForm/public/form/formGroup1.vue')['default'] - FormItem: typeof import('./../components/DesignForm/public/form/formItem.vue')['default'] - FormPage: typeof import('./../components/DesignForm/app/formPage.vue')['default'] - FormPageCont: typeof import('./../components/DesignForm/tableListPage/formPageCont.vue')['default'] - FormPageContApp: typeof import('./../components/DesignForm/tableListPage/formPageContApp.vue')['default'] - FormVersion: typeof import('./../components/DesignForm/formVersion.vue')['default'] - FormWord: typeof import('./../components/workflow/dialog/formWord.vue')['default'] - GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] - Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] - HeadTools: typeof import('./../components/DesignForm/public/headTools.vue')['default'] - HeadToolsApp: typeof import('./../components/DesignForm/public/headToolsApp.vue')['default'] - 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'] -<<<<<<< HEAD - 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'] -======= - IEpDelete: typeof import('~icons/ep/delete')['default'] - IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpMessageBox: typeof import('~icons/ep/message-box')['default'] - IEpOperation: typeof import('~icons/ep/operation')['default'] - IEpPlus: typeof import('~icons/ep/plus')['default'] ->>>>>>> lwx_v11 - 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'] - ListTreeSide: typeof import('./../components/DesignForm/public/form/components/listTreeSide.vue')['default'] - MathFormula: typeof import('./../components/DesignForm/math/mathFormula.vue')['default'] - Matrix: typeof import('./../components/workflow/dialog/matrix.vue')['default'] - MultiUpload: typeof import('./../components/Upload/MultiUpload.vue')['default'] - NodeWrap: typeof import('./../components/workflow/nodeWrap.vue')['default'] - PageSize: typeof import('./../components/DesignForm/designLayout/pageSize.vue')['default'] - PageSizeSmail: typeof import('./../components/DesignForm/designLayout/pageSizeSmail.vue')['default'] - Pagination: typeof import('./../components/Pagination/index.vue')['default'] - PositionDialog: typeof import('./../components/workflow/dialog/positionDialog.vue')['default'] - PromoterDrawer: typeof import('./../components/workflow/drwer/promoterDrawer.vue')['default'] - RightPanel: typeof import('./../components/RightPanel/index.vue')['default'] - RoleDialog: typeof import('./../components/workflow/dialog/roleDialog.vue')['default'] - RouterLink: typeof import('vue-router')['RouterLink'] - RouterView: typeof import('vue-router')['RouterView'] - Screen: typeof import('./../components/DesignForm/public/form/components/screen.vue')['default'] - Select: typeof import('./../components/DesignForm/public/form/select.vue')['default'] - SelectBoxs: typeof import('./../components/workflow/selectBoxs.vue')['default'] - SelectResult: typeof import('./../components/workflow/selectResult.vue')['default'] - SingleUpload: typeof import('./../components/Upload/SingleUpload.vue')['default'] - SizeSelect: typeof import('./../components/SizeSelect/index.vue')['default'] - SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default'] - SvgPage: typeof import('./../components/IconSelect/svgPage.vue')['default'] - TableListPage: typeof import('./../components/DesignForm/tableListPage/index.vue')['default'] - Template: typeof import('./../components/DesignForm/template.vue')['default'] - TextPage: typeof import('./../components/DesignForm/designLayout/textPage.vue')['default'] - Tinymce: typeof import('./../components/DesignForm/public/form/tinymce.vue')['default'] - Tinymce_1: typeof import('./../components/DesignForm/public/form/tinymce_1.vue')['default'] - Tooltip: typeof import('./../components/DesignForm/tooltip.vue')['default'] - UnitBackGround: typeof import('./../components/DesignForm/designLayout/unitBackGround.vue')['default'] - User: typeof import('./../components/DesignForm/public/expand/user.vue')['default'] - UserDialog: typeof import('./../components/DesignForm/public/expand/userDialog.vue')['default'] - VueFile: typeof import('./../components/DesignForm/vueFile.vue')['default'] - WangEditor: typeof import('./../components/WangEditor/index.vue')['default'] - Yuanjao: typeof import('./../components/DesignForm/designLayout/yuanjao.vue')['default'] - } - export interface ComponentCustomProperties { - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } -} From 71d982035cfe0620deff1434688c60fba6c69c9a Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 26 Jun 2024 16:59:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E9=80=89=E9=A1=B9v0.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/DesignForm/requestapi.ts | 11 +++++++ src/components/DesignForm/app/index.vue | 2 +- .../DesignForm/public/form/formItem.vue | 13 ++------ .../DesignForm/tableListPage/index.vue | 3 +- .../sysworkflow/lowcodepage/appFormList.vue | 1 + .../appPage/appPageForm/openAppFormPage.vue | 30 ++++++++++++++++++- .../appPage/appPageForm/pageForm.vue | 4 +-- .../lowcodepage/pageFlow/appTableFlow.vue | 1 - .../lowcodepage/runApp/runAppForm.vue | 24 ++++++++++++++- 9 files changed, 72 insertions(+), 17 deletions(-) diff --git a/src/api/DesignForm/requestapi.ts b/src/api/DesignForm/requestapi.ts index 510901f56..8d6043d15 100644 --- a/src/api/DesignForm/requestapi.ts +++ b/src/api/DesignForm/requestapi.ts @@ -544,3 +544,14 @@ export function afreshAppSubmit(data: any) { data: data }); } + +//动态获取关联的系统字段数据作为单选下拉多选的选项 +export function getFieldRecord(param1: any) { + return request({ + url: '/javasys/lowCode/AssociatedForms/getFieldRecord', + method: 'post', + data: { + optionsValue3Field:param1 + }, + }); +} diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 5a10c97cf..db0f59c70 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -322,7 +322,7 @@ onMounted(()=>{ */ const judjeRadio = (val: any, options: any[]) => { // console.log("判断单选值",val, options) - if(options.length > 0){ + if(options && options.length > 0){ options.forEach((item)=>{ if(item.value == val){ console.log("判断单选值",val, item.value,item.label) diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue index 593f0902c..90e39b4ce 100644 --- a/src/components/DesignForm/public/form/formItem.vue +++ b/src/components/DesignForm/public/form/formItem.vue @@ -286,18 +286,11 @@ const getAxiosOptions = debounce((data?: any) => { 在这里请求后台获取字段 */ getFieldRecord(props.data.control.optionsValue3Field).then(({ data }) => { - //console.log(data) - //console.log(props.data.name) + let fieldName = props.data.name - //console.log(options.value) - //options.value = data - /* - - - */ + emits('optionsValue3Get1',data,fieldName) - //console.log(options.value) - //console.log() + }) diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue index 9238dc605..be9061914 100644 --- a/src/components/DesignForm/tableListPage/index.vue +++ b/src/components/DesignForm/tableListPage/index.vue @@ -236,6 +236,7 @@ const selectionChange = (row: any) => { @ 功能: 获取表格头内容 */ const columnsFilter = computed(() => { + if (!state.columnsCheck?.length) { return props.data.columns } else { @@ -311,7 +312,7 @@ onMounted(()=>{ */ const judjeRadio = (val: any, options: any[]) => { // console.log("判断单选值",val, options) - if(options.length > 0){ + if(options && options.length > 0){ options.forEach((item)=>{ if(item.value == val){ console.log("判断单选值",val, item.value,item.label) diff --git a/src/views/sysworkflow/lowcodepage/appFormList.vue b/src/views/sysworkflow/lowcodepage/appFormList.vue index b7a402796..2463eb6aa 100644 --- a/src/views/sysworkflow/lowcodepage/appFormList.vue +++ b/src/views/sysworkflow/lowcodepage/appFormList.vue @@ -173,6 +173,7 @@ const lookFormList = (val:any) => { versionTitle.value = val.name let stateData = string2json(val.listjson) + console.log(val.listjson) console.log("查看表单列表---->",stateData) state.tableData = stateData.tableData state.searchData = stateData.searchData diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue index 53c5e7995..7edbc91fe 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue +++ b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue @@ -5,7 +5,7 @@ -->