From 018744e5adc1f2b215e99601333a27d2353ce9a5 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Sun, 3 Mar 2024 10:20:13 +0800 Subject: [PATCH 01/10] no message --- src/types/components.d.ts | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 2fbfb8aef..b41689361 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -18,14 +18,11 @@ declare module '@vue/runtime-core' { CopyerDrawer: typeof import('./../components/workflow/drwer/copyerDrawer.vue')['default'] DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default'] DragControl: typeof import('./../components/DesignForm/dragControl.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'] @@ -50,10 +47,8 @@ declare module '@vue/runtime-core' { ElFormItem: typeof import('element-plus/es')['ElFormItem'] 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'] @@ -62,14 +57,10 @@ declare module '@vue/runtime-core' { 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'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - 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'] @@ -78,11 +69,8 @@ declare module '@vue/runtime-core' { 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'] @@ -105,25 +93,13 @@ 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'] List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default'] From 9dc9a05598d9e2fe8b268f72a0c288d69a014b43 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Sun, 3 Mar 2024 10:28:34 +0800 Subject: [PATCH 02/10] 1 --- src/types/components.d.ts | 156 -------------------------------------- 1 file changed, 156 deletions(-) diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 5cf766fe4..e69de29bb 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -1,156 +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 { - '副本': typeof import('./../components/DesignForm/formControlAttr - 副本.vue')['default'] - AceDrawer: typeof import('./../components/DesignForm/aceDrawer.vue')['default'] - AddNode: typeof import('./../components/workflow/addNode.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'] - 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'] - 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'] - ElIcon: typeof import('element-plus/es')['ElIcon'] - ElImage: typeof import('element-plus/es')['ElImage'] - ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - 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'] - ElPopover: typeof import('element-plus/es')['ElPopover'] - ElProgress: typeof import('element-plus/es')['ElProgress'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElRow: typeof import('element-plus/es')['ElRow'] - ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] - ElSelect: typeof import('element-plus/es')['ElSelect'] -<<<<<<< HEAD -======= - 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'] ->>>>>>> v7_master - 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'] - ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] - ElTooltip: typeof import('element-plus/es')['ElTooltip'] - 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'] - 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'] - 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'] - 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'] - IEpClose: typeof import('~icons/ep/close')['default'] - IEpDelete: typeof import('~icons/ep/delete')['default'] - IEpEdit: typeof import('~icons/ep/edit')['default'] - IEpPlus: typeof import('~icons/ep/plus')['default'] - IEpRefresh: typeof import('~icons/ep/refresh')['default'] - IEpSearch: typeof import('~icons/ep/search')['default'] - IEpSetting: typeof import('~icons/ep/setting')['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'] - 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 b3d9418c8681a7cac431365273970300406b6706 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Tue, 5 Mar 2024 16:02:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DesignForm/formControlAttr.vue | 4 +-- .../DesignForm/layoutPage/index.vue | 14 +++++----- src/types/components.d.ts | 26 ++++++++++++++++--- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index 6d8567c9b..ae386a073 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -2032,7 +2032,7 @@ const cssIsShouw = (val:any) => { - 组件布局 + 高级属性 @@ -2216,7 +2216,7 @@ const cssIsShouw = (val:any) => { - + diff --git a/src/components/DesignForm/layoutPage/index.vue b/src/components/DesignForm/layoutPage/index.vue index d341e77aa..69ebb4487 100644 --- a/src/components/DesignForm/layoutPage/index.vue +++ b/src/components/DesignForm/layoutPage/index.vue @@ -31,7 +31,7 @@ const inputUnitTitle = (val:string) => { console.log("inputUnitTitle",val); switch (val) { case "radio": - return "Radio布局" + return "输入设置" break; case "select": unitIsShow.value = false; @@ -76,10 +76,10 @@ const inputUnitTitle = (val:string) => { default: unitIsShow.value = true; labelIsShow.value = true; - return "Input布局" + return "输入设置" break; } - return "Input布局" + return "输入设置" } // const divStyle = reactive({}) // watch(()=>divStyle,(val : any)=>{ @@ -104,10 +104,10 @@ const activeName = ref('0')