From 6a07a7c5d9cd7c905f515a7cd79608b07d1b55d2 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Tue, 9 Jul 2024 15:16:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/components.d.ts | 192 -------------------------------------- 1 file changed, 192 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 a07ef5f7e..000000000 --- a/src/types/components.d.ts +++ /dev/null @@ -1,192 +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'] - 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'] - 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'] - QuillEditor: typeof import('./../components/DesignForm/public/quillEditor.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'] - TimeAxis: typeof import('./../components/DesignForm/app/timeAxis.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 { - vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll'] - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } -} From 1bc49b327e75c6c3fd8aad7deeebc64069d4cca1 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 10 Jul 2024 11:55:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1.=E6=95=B0=E6=8D=AE=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B6=88=E9=99=A4=E5=AD=90=E8=A1=A8=E9=80=89?= =?UTF-8?q?=E9=A1=B9=202.=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=95=B0=E6=8D=AE=E6=A0=87=E9=A2=98=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/formControlAttr.vue | 13 +++- .../DesignForm/formControlPropertiNew.vue | 17 +++++- .../DesignForm/public/form/formGroup.vue | 2 +- .../associatedforms/associatedForms.vue | 61 ++++++++++++++++--- src/widget/associatedforms/index.vue | 2 +- 5 files changed, 81 insertions(+), 14 deletions(-) diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index 38941689c..a6f7f5b03 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -2034,6 +2034,7 @@ function formidChangedOptionsValue3(){ } const associatedFormsCurrentFormFieldTree = ref() +const associatedFormsCurrentFormFieldTreeNoTable = ref() const associatedFormsCurrentFormFieldTreeForGlxxsz = ref() let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref() let resDataForGlxxszExceptself: any[] = [] @@ -2047,6 +2048,7 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => { //alert("cfid为空") }else{ let resData = ref(data.children) + let resDataNoTable = JSON.parse(JSON.stringify(data.children)) //let rootid_ = data.value.label associatedFormsCurrentFormFieldTree.value = [{ id: 'rootid_'+data.label, @@ -2056,6 +2058,15 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => { treeAttrs: data.treeAttrs, }] + resDataNoTable = resDataNoTable.filter((item: { type: string | null }) => item.type!="table") + + associatedFormsCurrentFormFieldTreeNoTable.value = [{ + id: 'rootid_'+data.label, + label: '当前表单-'+data.treeAttrs.show, + children: [...resDataNoTable], + treeAttrs: data.treeAttrs, + }] + let resDataForGlxxsz = ref(data.children.slice(8)) resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value)); @@ -3477,7 +3488,7 @@ const disabledIstrue = (val:string) => { multiple clearable collapse-tags - :data="associatedFormsCurrentFormFieldTree" + :data="associatedFormsCurrentFormFieldTreeNoTable" :render-after-expand="false" style="width: 240px" /> diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 8f0552262..8299cf1b5 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -2076,6 +2076,7 @@ function formidChangedOptionsValue3(){ } const associatedFormsCurrentFormFieldTree = ref() +const associatedFormsCurrentFormFieldTreeNoTable = ref() const associatedFormsCurrentFormFieldTreeForGlxxsz = ref() let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref() let resDataForGlxxszExceptself: any[] = [] @@ -2089,20 +2090,30 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => { //alert("cfid为空") }else{ let resData = ref(data.children) + let resDataNoTable = JSON.parse(JSON.stringify(data.children)) + //let rootid_ = data.value.label associatedFormsCurrentFormFieldTree.value = [{ id: 'rootid_'+data.label, - //label: '当前表单', label: '当前表单-'+data.treeAttrs.show, children: [...resData.value], treeAttrs: data.treeAttrs, }] + + resDataNoTable = resDataNoTable.filter((item: { type: string | null }) => item.type!="table") + + associatedFormsCurrentFormFieldTreeNoTable.value = [{ + id: 'rootid_'+data.label, + label: '当前表单-'+data.treeAttrs.show, + children: [...resDataNoTable], + treeAttrs: data.treeAttrs, + }] let resDataForGlxxsz = ref(data.children.slice(8)) resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value)); - // console.log(resDataForGlxxszExceptself) + @@ -3526,7 +3537,7 @@ const disabledIstrue = (val:string) => { multiple clearable collapse-tags - :data="associatedFormsCurrentFormFieldTree" + :data="associatedFormsCurrentFormFieldTreeNoTable" :render-after-expand="false" style="width: 240px" /> diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index 4830e0d58..5f2ca1ab6 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -576,7 +576,7 @@ function optionsValue3Get1(data: any,fieldName: string){ - + diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue index a993a2de6..a7acd0a8d 100644 --- a/src/widget/associatedforms/associatedForms.vue +++ b/src/widget/associatedforms/associatedForms.vue @@ -8,15 +8,32 @@ - \ No newline at end of file diff --git a/src/widget/associatedforms/index.vue b/src/widget/associatedforms/index.vue index 162b8041a..577cf84da 100644 --- a/src/widget/associatedforms/index.vue +++ b/src/widget/associatedforms/index.vue @@ -14,7 +14,7 @@ - +