From ed5b9fc602041b021e1ac14eb6d801041147c5d8 Mon Sep 17 00:00:00 2001 From: Jerry <707344974@qq.com> Date: Sun, 14 Jul 2024 22:11:19 +0800 Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E5=89=8D=E7=AB=AFwebpack?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OrangeFormsOpen-VUE3/.browserslistrc | 4 + OrangeFormsOpen-VUE3/.env.development | 4 +- OrangeFormsOpen-VUE3/.env.production | 4 +- OrangeFormsOpen-VUE3/auto-imports.d.ts | 83 + OrangeFormsOpen-VUE3/babel.config.js | 3 + OrangeFormsOpen-VUE3/components.d.ts | 66 +- OrangeFormsOpen-VUE3/index.html | 2 +- OrangeFormsOpen-VUE3/package-lock.json | 27636 +++++++++++++--- OrangeFormsOpen-VUE3/package.json | 30 +- OrangeFormsOpen-VUE3/src/App.vue | 2 +- .../src/assets/style/base.scss | 30 +- .../src/common/hooks/useDate.ts | 3 - .../src/common/hooks/useDownload.ts | 2 - .../src/common/hooks/useDropdown.ts | 3 - .../src/common/hooks/usePermission.ts | 1 - .../src/common/hooks/useTable.ts | 12 - .../src/common/hooks/useUpload.ts | 5 +- .../src/common/hooks/useUrl.ts | 6 +- .../src/common/hooks/useWindowResize.ts | 1 - OrangeFormsOpen-VUE3/src/common/http/axios.ts | 3 - .../src/common/http/config.ts | 2 +- .../src/common/http/request.ts | 16 - .../src/common/staticDict/combined.ts | 2 + .../src/common/staticDict/generated.ts | 4 + .../src/common/utils/index.ts | 5 +- .../src/components/AdvanceQuery/index.vue | 2 +- .../src/components/Dialog/index.ts | 8 +- .../components/SpreadSheet/component/sheet.js | 3 + .../src/components/SpreadSheet/index.d.ts | 193 - .../components/layout/components/SubMenu.vue | 4 +- .../src/components/layout/index.vue | 2 +- OrangeFormsOpen-VUE3/src/main.ts | 10 + .../online/components/OnlineCustomTable.vue | 4 +- .../AttributeCollapse/editWidgetAttribute.vue | 34 +- .../online/OnlinePageRender/hooks/useForm.ts | 2 +- .../dataModel/{indev.vue => index.vue} | 0 .../src/pages/online/editOnlinePage/index.vue | 5 +- .../pages/online/hooks/useWidgetToolkit.ts | 3 +- .../src/pages/welcome/index.vue | 2 +- .../workflow/flowEntry/formEditFlowEntry.vue | 33 +- .../flowEntry/formPublishedFlowEntry.vue | 6 +- .../src/router/systemRouters.ts | 6 +- .../src/{vite-env.d.ts => shims-vue.d.ts} | 14 +- .../src/types/online/column.d.ts | 2 + OrangeFormsOpen-VUE3/tsconfig.json | 40 +- OrangeFormsOpen-VUE3/vite.config.ts | 58 - OrangeFormsOpen-VUE3/vue.config.js | 46 + 47 files changed, 23209 insertions(+), 5197 deletions(-) create mode 100644 OrangeFormsOpen-VUE3/.browserslistrc create mode 100644 OrangeFormsOpen-VUE3/auto-imports.d.ts create mode 100644 OrangeFormsOpen-VUE3/babel.config.js create mode 100644 OrangeFormsOpen-VUE3/src/common/staticDict/generated.ts delete mode 100644 OrangeFormsOpen-VUE3/src/components/SpreadSheet/index.d.ts rename OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/dataModel/{indev.vue => index.vue} (100%) rename OrangeFormsOpen-VUE3/src/{vite-env.d.ts => shims-vue.d.ts} (68%) delete mode 100644 OrangeFormsOpen-VUE3/vite.config.ts create mode 100644 OrangeFormsOpen-VUE3/vue.config.js diff --git a/OrangeFormsOpen-VUE3/.browserslistrc b/OrangeFormsOpen-VUE3/.browserslistrc new file mode 100644 index 00000000..dc3bc09a --- /dev/null +++ b/OrangeFormsOpen-VUE3/.browserslistrc @@ -0,0 +1,4 @@ +> 1% +last 2 versions +not dead +not ie 11 diff --git a/OrangeFormsOpen-VUE3/.env.development b/OrangeFormsOpen-VUE3/.env.development index aec1dbb3..2c0cf889 100644 --- a/OrangeFormsOpen-VUE3/.env.development +++ b/OrangeFormsOpen-VUE3/.env.development @@ -1,2 +1,2 @@ -VITE_SERVER_HOST='http://localhost:8082/' -VITE_PROJECT_NAME='橙单演示工程' +VUE_APP_SERVER_HOST='http://localhost:8082/' +VUE_APP_PROJECT_NAME='橙单演示工程' diff --git a/OrangeFormsOpen-VUE3/.env.production b/OrangeFormsOpen-VUE3/.env.production index 1db60839..49b07615 100644 --- a/OrangeFormsOpen-VUE3/.env.production +++ b/OrangeFormsOpen-VUE3/.env.production @@ -1,2 +1,2 @@ -VITE_SERVER_HOST='http://localhost:8082/' -VITE_PROJECT_NAME='橙单项目' \ No newline at end of file +VUE_APP_SERVER_HOST='http://localhost:8082/' +VUE_APP_PROJECT_NAME='橙单项目' diff --git a/OrangeFormsOpen-VUE3/auto-imports.d.ts b/OrangeFormsOpen-VUE3/auto-imports.d.ts new file mode 100644 index 00000000..0ce0ca81 --- /dev/null +++ b/OrangeFormsOpen-VUE3/auto-imports.d.ts @@ -0,0 +1,83 @@ +/* eslint-disable */ +/* prettier-ignore */ +// @ts-nocheck +// noinspection JSUnusedGlobalSymbols +// Generated by unplugin-auto-import +export {} +declare global { + const EffectScope: typeof import('vue')['EffectScope'] + const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate'] + const computed: typeof import('vue')['computed'] + const createApp: typeof import('vue')['createApp'] + const createPinia: typeof import('pinia')['createPinia'] + const customRef: typeof import('vue')['customRef'] + const defineAsyncComponent: typeof import('vue')['defineAsyncComponent'] + const defineComponent: typeof import('vue')['defineComponent'] + const defineStore: typeof import('pinia')['defineStore'] + const effectScope: typeof import('vue')['effectScope'] + const getActivePinia: typeof import('pinia')['getActivePinia'] + const getCurrentInstance: typeof import('vue')['getCurrentInstance'] + const getCurrentScope: typeof import('vue')['getCurrentScope'] + const h: typeof import('vue')['h'] + const inject: typeof import('vue')['inject'] + const isProxy: typeof import('vue')['isProxy'] + const isReactive: typeof import('vue')['isReactive'] + const isReadonly: typeof import('vue')['isReadonly'] + const isRef: typeof import('vue')['isRef'] + const mapActions: typeof import('pinia')['mapActions'] + const mapGetters: typeof import('pinia')['mapGetters'] + const mapState: typeof import('pinia')['mapState'] + const mapStores: typeof import('pinia')['mapStores'] + const mapWritableState: typeof import('pinia')['mapWritableState'] + const markRaw: typeof import('vue')['markRaw'] + const nextTick: typeof import('vue')['nextTick'] + const onActivated: typeof import('vue')['onActivated'] + const onBeforeMount: typeof import('vue')['onBeforeMount'] + const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave'] + const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate'] + const onBeforeUnmount: typeof import('vue')['onBeforeUnmount'] + const onBeforeUpdate: typeof import('vue')['onBeforeUpdate'] + const onDeactivated: typeof import('vue')['onDeactivated'] + const onErrorCaptured: typeof import('vue')['onErrorCaptured'] + const onMounted: typeof import('vue')['onMounted'] + const onRenderTracked: typeof import('vue')['onRenderTracked'] + const onRenderTriggered: typeof import('vue')['onRenderTriggered'] + const onScopeDispose: typeof import('vue')['onScopeDispose'] + const onServerPrefetch: typeof import('vue')['onServerPrefetch'] + const onUnmounted: typeof import('vue')['onUnmounted'] + const onUpdated: typeof import('vue')['onUpdated'] + const provide: typeof import('vue')['provide'] + const reactive: typeof import('vue')['reactive'] + const readonly: typeof import('vue')['readonly'] + const ref: typeof import('vue')['ref'] + const resolveComponent: typeof import('vue')['resolveComponent'] + const setActivePinia: typeof import('pinia')['setActivePinia'] + const setMapStoreSuffix: typeof import('pinia')['setMapStoreSuffix'] + const shallowReactive: typeof import('vue')['shallowReactive'] + const shallowReadonly: typeof import('vue')['shallowReadonly'] + const shallowRef: typeof import('vue')['shallowRef'] + const storeToRefs: typeof import('pinia')['storeToRefs'] + const toRaw: typeof import('vue')['toRaw'] + const toRef: typeof import('vue')['toRef'] + const toRefs: typeof import('vue')['toRefs'] + const toValue: typeof import('vue')['toValue'] + const triggerRef: typeof import('vue')['triggerRef'] + const unref: typeof import('vue')['unref'] + const useAttrs: typeof import('vue')['useAttrs'] + const useCssModule: typeof import('vue')['useCssModule'] + const useCssVars: typeof import('vue')['useCssVars'] + const useLink: typeof import('vue-router')['useLink'] + const useRoute: typeof import('vue-router')['useRoute'] + const useRouter: typeof import('vue-router')['useRouter'] + const useSlots: typeof import('vue')['useSlots'] + const watch: typeof import('vue')['watch'] + const watchEffect: typeof import('vue')['watchEffect'] + const watchPostEffect: typeof import('vue')['watchPostEffect'] + const watchSyncEffect: typeof import('vue')['watchSyncEffect'] +} +// for type re-export +declare global { + // @ts-ignore + export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue' + import('vue') +} diff --git a/OrangeFormsOpen-VUE3/babel.config.js b/OrangeFormsOpen-VUE3/babel.config.js new file mode 100644 index 00000000..078c0056 --- /dev/null +++ b/OrangeFormsOpen-VUE3/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ['@vue/cli-plugin-babel/preset'], +}; diff --git a/OrangeFormsOpen-VUE3/components.d.ts b/OrangeFormsOpen-VUE3/components.d.ts index 2be5a445..b3a82c59 100644 --- a/OrangeFormsOpen-VUE3/components.d.ts +++ b/OrangeFormsOpen-VUE3/components.d.ts @@ -8,17 +8,11 @@ export {} declare module 'vue' { export interface GlobalComponents { AdvanceQuery: typeof import('./src/components/AdvanceQuery/index.vue')['default'] - BarChart: typeof import('./src/components/Charts/barChart.vue')['default'] - Base: typeof import('./src/components/Charts/base.vue')['default'] - BreadCrumb: typeof import('./src/components/layout/components/BreadCrumb.vue')['default'] - CarouselChart: typeof import('./src/components/Charts/carouselChart.vue')['default'] - CommonList: typeof import('./src/components/Charts/commonList.vue')['default'] - DataCard: typeof import('./src/components/Charts/dataCard.vue')['default'] - DataProgressCard: typeof import('./src/components/Charts/dataProgressCard.vue')['default'] - DataViewTable: typeof import('./src/components/Charts/dataViewTable.vue')['default'] + BtnsRightAddBtn: typeof import('./src/components/Btns/RightAddBtn.vue')['default'] DateRange: typeof import('./src/components/DateRange/index.vue')['default'] DeptSelect: typeof import('./src/components/DeptSelect/index.vue')['default'] - DeptSelectDlg: typeof import('./src/components/DeptSelect/DeptSelectDlg.vue')['default'] + DeptSelectDeptSelectDlg: typeof import('./src/components/DeptSelect/DeptSelectDlg.vue')['default'] + DialogLayout: typeof import('./src/components/Dialog/layout.vue')['default'] ElAlert: typeof import('element-plus/es')['ElAlert'] ElAside: typeof import('element-plus/es')['ElAside'] ElBadge: typeof import('element-plus/es')['ElBadge'] @@ -27,8 +21,6 @@ declare module 'vue' { 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'] ElCol: typeof import('element-plus/es')['ElCol'] @@ -44,7 +36,6 @@ declare module 'vue' { ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] - ElEmpty: typeof import('element-plus/es')['ElEmpty'] ElFooter: typeof import('element-plus/es')['ElFooter'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] @@ -53,8 +44,6 @@ declare module 'vue' { ElIconArrowDown: typeof import('@element-plus/icons-vue')['ArrowDown'] ElIconArrowLeft: typeof import('@element-plus/icons-vue')['ArrowLeft'] ElIconArrowRight: typeof import('@element-plus/icons-vue')['ArrowRight'] - ElIconCaretBottom: typeof import('@element-plus/icons-vue')['CaretBottom'] - ElIconClose: typeof import('@element-plus/icons-vue')['Close'] ElImage: typeof import('element-plus/es')['ElImage'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] @@ -65,7 +54,6 @@ declare module 'vue' { 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'] ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] @@ -84,58 +72,30 @@ declare module 'vue' { ElTree: typeof import('element-plus/es')['ElTree'] ElUpload: typeof import('element-plus/es')['ElUpload'] FilterBox: typeof import('./src/components/FilterBox/index.vue')['default'] - FunnelChart: typeof import('./src/components/Charts/funnelChart.vue')['default'] - FunnelChartV3: typeof import('./src/components/Charts/funnelChartV3.vue')['default'] - GaugeChart: typeof import('./src/components/Charts/gaugeChart.vue')['default'] Icons: typeof import('./src/components/icons/index.vue')['default'] IconSelect: typeof import('./src/components/IconSelect/index.vue')['default'] InputNumberRange: typeof import('./src/components/InputNumberRange/index.vue')['default'] - Layout: typeof import('./src/components/Dialog/layout.vue')['default'] - LineChart: typeof import('./src/components/Charts/lineChart.vue')['default'] - MultiColumn: typeof import('./src/components/layout/components/multi-column.vue')['default'] - MultiColumnMenu: typeof import('./src/components/layout/components/multi-column-menu.vue')['default'] + Layout: typeof import('./src/components/layout/index.vue')['default'] + LayoutComponentsBreadCrumb: typeof import('./src/components/layout/components/BreadCrumb.vue')['default'] + LayoutComponentsMultiColumn: typeof import('./src/components/layout/components/multi-column.vue')['default'] + LayoutComponentsMultiColumnMenu: typeof import('./src/components/layout/components/multi-column-menu.vue')['default'] + LayoutComponentsSidebar: typeof import('./src/components/layout/components/Sidebar.vue')['default'] + LayoutComponentsSubMenu: typeof import('./src/components/layout/components/SubMenu.vue')['default'] + LayoutComponentsTagItem: typeof import('./src/components/layout/components/TagItem.vue')['default'] + LayoutComponentsTagPanel: typeof import('./src/components/layout/components/TagPanel.vue')['default'] MultiItemBox: typeof import('./src/components/MultiItemBox/index.vue')['default'] MultiItemList: typeof import('./src/components/MultiItemList/index.vue')['default'] PageCloseButton: typeof import('./src/components/PageCloseButton/index.vue')['default'] - PieChart: typeof import('./src/components/Charts/pieChart.vue')['default'] - PivotTable: typeof import('./src/components/Charts/pivotTable.vue')['default'] - PivotTableColumn: typeof import('./src/components/Charts/pivotTableColumn.vue')['default'] Progress: typeof import('./src/components/Progress/index.vue')['default'] - ProgressBar: typeof import('./src/components/Charts/progressBar.vue')['default'] - ProgressCircle: typeof import('./src/components/Charts/progressCircle.vue')['default'] - RadarChart: typeof import('./src/components/Charts/radarChart.vue')['default'] - RadarChartV3: typeof import('./src/components/Charts/radarChartV3.vue')['default'] RichEditor: typeof import('./src/components/RichEditor/index.vue')['default'] - RichText: typeof import('./src/components/Charts/richText.vue')['default'] - RightAddBtn: typeof import('./src/components/Btns/RightAddBtn.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] - ScatterChart: typeof import('./src/components/Charts/scatterChart.vue')['default'] - ScriptEditor: typeof import('./src/components/ScriptEditor/index.vue')['default'] - Sidebar: typeof import('./src/components/layout/components/Sidebar.vue')['default'] StepBar: typeof import('./src/components/StepBar/index.vue')['default'] - StepItem: typeof import('./src/components/StepBar/stepItem.vue')['default'] - SubMenu: typeof import('./src/components/layout/components/SubMenu.vue')['default'] + StepBarStepItem: typeof import('./src/components/StepBar/stepItem.vue')['default'] TableBox: typeof import('./src/components/TableBox/index.vue')['default'] TableProgressColumn: typeof import('./src/components/TableProgressColumn/index.vue')['default'] - TagItem: typeof import('./src/components/layout/components/TagItem.vue')['default'] - TagPanel: typeof import('./src/components/layout/components/TagPanel.vue')['default'] ThirdParty: typeof import('./src/components/thirdParty/index.vue')['default'] UserSelect: typeof import('./src/components/UserSelect/index.vue')['default'] - UserSelectDlg: typeof import('./src/components/UserSelect/UserSelectDlg.vue')['default'] - VanButton: typeof import('vant/es')['Button'] - VanCellGroup: typeof import('vant/es')['CellGroup'] - VanCheckbox: typeof import('vant/es')['Checkbox'] - VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup'] - VanForm: typeof import('vant/es')['Form'] - VanRadio: typeof import('vant/es')['Radio'] - VanRadioGroup: typeof import('vant/es')['RadioGroup'] - VanRate: typeof import('vant/es')['Rate'] - VanSearch: typeof import('vant/es')['Search'] - VanSidebar: typeof import('vant/es')['Sidebar'] - VanSidebarItem: typeof import('vant/es')['SidebarItem'] - VanStepper: typeof import('vant/es')['Stepper'] - VanSwitch: typeof import('vant/es')['Switch'] - VanUploader: typeof import('vant/es')['Uploader'] + UserSelectUserSelectDlg: typeof import('./src/components/UserSelect/UserSelectDlg.vue')['default'] } } diff --git a/OrangeFormsOpen-VUE3/index.html b/OrangeFormsOpen-VUE3/index.html index a3dda7ba..023f6a14 100644 --- a/OrangeFormsOpen-VUE3/index.html +++ b/OrangeFormsOpen-VUE3/index.html @@ -8,6 +8,6 @@
- +