From 525ba6f454f5e03687eb3c2391f28781fa226c43 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Tue, 19 Mar 2024 16:53:55 +0800
Subject: [PATCH] updates
---
.env | 4 +-
.env.development | 11 +-
.env.production | 18 +-
.gitignore | 2 +
LICENSE | 6 +-
README.md | 24 +-
build/generate/generateModifyVars.ts | 24 +-
build/script/buildConf.ts | 2 +-
build/vite/plugin/compress.ts | 4 +
build/vite/plugin/html.ts | 4 +-
build/vite/plugin/imagemin.ts | 1 +
build/vite/plugin/index.ts | 40 +-
build/vite/plugin/pwa.ts | 34 -
build/vite/plugin/styleImport.ts | 1 +
build/vite/plugin/theme.ts | 2 +-
index.html | 11 +
mock/demo/select-demo.ts | 19 +-
mock/demo/tree-demo.ts | 2 +-
package.json | 318 +-
pnpm-lock.yaml | 10778 ++++++----------
public/logo.png | Bin 7519 -> 23113 bytes
public/resource/img/logo.png | Bin 7519 -> 23113 bytes
public/resource/img/pwa-192x192.png | Bin 12205 -> 0 bytes
public/resource/img/pwa-512x512.png | Bin 52656 -> 0 bytes
public/resource/js/iconfont.js | 2 +-
src/App.vue | 60 +-
src/api/sys/menu.ts | 7 +
src/api/sys/user.ts | 23 +-
src/assets/images/department.png | Bin 0 -> 1062 bytes
src/assets/images/drag_cover.png | Bin 0 -> 3224 bytes
src/assets/images/logo.png | Bin 7519 -> 23113 bytes
src/assets/images/people.png | Bin 0 -> 2333 bytes
src/assets/images/process_no_form.png | Bin 0 -> 407857 bytes
src/assets/images/setting.png | Bin 0 -> 2958 bytes
src/assets/images/template_cover.jpg | Bin 0 -> 75539 bytes
src/assets/images/wallet.png | Bin 0 -> 2706 bytes
src/assets/loginmini/icon/jeecg_logo-old.png | Bin 0 -> 11764 bytes
src/assets/loginmini/icon/jeecg_logo.png | Bin 11764 -> 23113 bytes
src/assets/loginmini/icon/logo-old.png | Bin 0 -> 3978 bytes
src/assets/loginmini/icon/logo.png | Bin 3978 -> 23113 bytes
src/assets/loginmini/icon/yitisheng (1).png | Bin 0 -> 23113 bytes
src/assets/svg/fileType/image.png | Bin 0 -> 9865 bytes
src/components/Application/src/AppLogo.vue | 9 +-
.../Application/src/search/AppSearchModal.vue | 4 +-
src/components/Basic/src/BasicTitle.vue | 4 +
src/components/CodeEditor/index.ts | 2 -
src/components/CodeEditor/src/CodeEditor.vue | 2 +-
.../src/json-preview/JsonPreview.vue | 12 -
.../CountDown/src/CountdownInput.vue | 2 +-
src/components/Cropper/src/Cropper.vue | 2 +-
src/components/Drawer/src/BasicDrawer.vue | 18 +-
.../Drawer/src/components/DrawerHeader.vue | 2 +-
src/components/Drawer/src/props.ts | 1 +
src/components/Drawer/src/typing.ts | 3 +
src/components/Drawer/src/useDrawer.ts | 18 +-
src/components/Dropdown/src/Dropdown.vue | 24 +-
src/components/Form/src/BasicForm.vue | 30 +-
src/components/Form/src/componentMap.ts | 10 +
.../Form/src/components/ApiSelect.vue | 34 +-
.../Form/src/components/ApiTreeSelect.vue | 4 +-
.../Form/src/components/FormAction.vue | 9 +-
.../Form/src/components/FormItem.vue | 75 +-
src/components/Form/src/helper.ts | 18 +
src/components/Form/src/hooks/useForm.ts | 8 +-
.../Form/src/hooks/useFormEvents.ts | 11 +-
.../src/jeecg/components/JAreaLinkage.vue | 2 +-
.../Form/src/jeecg/components/JAreaSelect.vue | 9 +-
.../Form/src/jeecg/components/JCheckbox.vue | 34 +-
.../Form/src/jeecg/components/JCodeEditor.vue | 30 +-
.../src/jeecg/components/JDictSelectTag.vue | 42 +-
.../Form/src/jeecg/components/JEllipsis.vue | 2 +-
.../src/jeecg/components/JImageUpload.vue | 34 +-
.../src/jeecg/components/JImportModal.vue | 13 +-
.../Form/src/jeecg/components/JInput.vue | 9 +-
.../Form/src/jeecg/components/JInputPop.vue | 4 +-
.../Form/src/jeecg/components/JPopup.vue | 11 +-
.../Form/src/jeecg/components/JPopupDict.vue | 217 +
.../src/jeecg/components/JSearchSelect.vue | 49 +-
.../Form/src/jeecg/components/JSelectDept.vue | 2 +-
.../src/jeecg/components/JSelectMultiple.vue | 22 +-
.../src/jeecg/components/JSelectPosition.vue | 2 +-
.../Form/src/jeecg/components/JSelectUser.vue | 21 +-
.../Form/src/jeecg/components/JSwitch.vue | 4 +-
.../Form/src/jeecg/components/JTreeSelect.vue | 2 +-
.../src/jeecg/components/JUpload/JUpload.vue | 36 +-
.../components/modal/DeptSelectModal.vue | 15 +-
.../components/modal/JPopupOnlReportModal.vue | 9 +-
.../components/modal/PositionSelectModal.vue | 18 +-
.../components/modal/RoleSelectModal.vue | 12 +-
.../components/modal/UserSelectByDepModal.vue | 10 +
.../components/modal/UserSelectModal.vue | 45 +-
.../components/roleSelect/RoleSelectInput.vue | 232 +
.../components/roleSelect/RoleSelectModal.vue | 24 +-
.../userSelect/SelectedUserItem.vue | 6 +
.../jeecg/components/userSelect/UserList.vue | 34 +-
.../userSelect/UserListAndDepart.vue | 18 +-
.../components/userSelect/UserListAndRole.vue | 21 +-
.../components/userSelect/UserSelectModal.vue | 30 +-
.../src/jeecg/components/userSelect/index.vue | 52 +-
.../components/userSelect/useUserSelect.ts | 11 +
.../Form/src/jeecg/hooks/useCodeHinting.ts | 69 +
.../Form/src/jeecg/hooks/useSelectBiz.ts | 8 +-
.../Form/src/jeecg/hooks/useTreeBiz.ts | 8 +-
src/components/Form/src/types/form.ts | 8 +-
src/components/Form/src/types/index.ts | 2 +
src/components/Icon/src/IconPicker.vue | 49 +-
.../src/components/JVxeDepartSelectCell.vue | 3 +-
.../src/components/JVxeFileCell.vue | 2 +-
.../src/components/JVxeImageCell.vue | 13 +-
.../src/components/JVxePopupCell.vue | 7 +-
.../src/components/JVxeUserSelectCell.vue | 3 +-
src/components/Markdown/src/Markdown.vue | 6 +-
.../Markdown/src/MarkdownViewer.vue | 116 +-
src/components/Modal/src/BasicModal.vue | 29 +-
src/components/Modal/src/components/Modal.tsx | 7 +-
.../Modal/src/components/ModalWrapper.vue | 35 +-
src/components/Modal/src/hooks/useModal.ts | 18 +-
src/components/Modal/src/index.less | 27 +-
src/components/Modal/src/props.ts | 4 +-
src/components/Modal/src/typing.ts | 3 +
src/components/SimpleMenu/src/SimpleMenu.vue | 28 +
.../SimpleMenu/src/components/SubMenuItem.vue | 4 +-
.../SimpleMenu/src/components/menu.less | 2 +-
.../StrengthMeter/src/StrengthMeter.vue | 18 +-
src/components/Table/src/BasicTable.vue | 25 +-
.../src/components/CustomSelectHeader.vue | 19 +-
.../Table/src/components/HeaderCell.vue | 11 +-
.../Table/src/components/TableAction.vue | 71 +-
.../Table/src/components/TableFooter.vue | 22 +-
.../Table/src/components/TableHeader.vue | 2 +-
.../src/components/editable/CellComponent.ts | 2 +-
.../Table/src/components/editable/index.ts | 6 +-
.../src/components/settings/ColumnSetting.vue | 33 +-
src/components/Table/src/hooks/useColumns.ts | 21 +-
.../Table/src/hooks/useColumnsCache.ts | 8 +-
.../Table/src/hooks/useCustomRow.ts | 9 +
.../Table/src/hooks/useCustomSelection.tsx | 133 +-
.../Table/src/hooks/useDataSource.ts | 10 +-
.../Table/src/hooks/useTableScroll.ts | 16 +-
src/components/Table/src/props.ts | 6 +
src/components/Table/src/types/column.ts | 4 +-
src/components/Table/src/types/table.ts | 6 +-
src/components/Table/src/types/tableAction.ts | 1 +
src/components/Tree/src/BasicTree.vue | 4 +-
src/components/chart/Radar.vue | 17 +-
.../chart/{Line.vue => SingleLine.vue} | 2 +-
src/components/jeecg/AiChat/assets/avatar.jpg | Bin 0 -> 5155 bytes
.../jeecg/AiChat/components/chat.vue | 445 +
.../jeecg/AiChat/components/chatMessage.vue | 73 +
.../jeecg/AiChat/components/chatText.vue | 125 +
.../jeecg/AiChat/components/slide.vue | 282 +
src/components/jeecg/AiChat/data.js | 186 +
src/components/jeecg/AiChat/hooks/useChat.ts | 28 +
.../jeecg/AiChat/hooks/useScroll.ts | 44 +
src/components/jeecg/AiChat/index.vue | 203 +
.../jeecg/AiChat/style/github-markdown.less | 1102 ++
.../jeecg/AiChat/style/highlight.less | 206 +
src/components/jeecg/AiChat/style/style.less | 135 +
src/components/jeecg/JPrompt/JPrompt.vue | 2 +-
.../jeecg/JVxeTable/src/componentMap.ts | 15 +-
.../src/components/JVxeSubPopover.vue | 2 +-
.../src/components/cells/JVxeDateCell.vue | 2 +-
.../src/components/cells/JVxeInputCell.vue | 14 +-
.../src/components/cells/JVxeSelectCell.vue | 7 +-
.../src/components/cells/JVxeTimeCell.vue | 4 +-
.../src/hooks/cells/useJVxeUploadCell.ts | 4 +-
.../jeecg/JVxeTable/src/hooks/useColumns.ts | 4 +-
.../jeecg/JVxeTable/src/hooks/useData.ts | 5 +-
.../JVxeTable/src/hooks/useDataSource.ts | 4 +-
.../JVxeTable/src/hooks/useFinallyProps.ts | 9 +-
.../JVxeTable/src/hooks/useJVxeComponent.ts | 22 +-
.../jeecg/JVxeTable/src/hooks/useMethods.ts | 81 +-
.../jeecg/JVxeTable/src/hooks/useToolbar.ts | 23 +-
.../JVxeTable/src/utils/enhancedUtils.ts | 100 -
.../jeecg/JVxeTable/src/vxe.data.ts | 9 +-
src/components/jeecg/JVxeTable/utils.ts | 110 +-
.../jeecg/OnLine/JPopupOnlReport.vue | 7 +-
.../jeecg/OnLine/SearchFormItem.vue | 5 +-
.../jeecg/OnLine/hooks/usePopBiz.ts | 90 +-
src/components/jeecg/comment/CommentFiles.vue | 24 +-
src/components/jeecg/comment/CommentList.vue | 18 +-
src/components/jeecg/comment/CommentPanel.vue | 4 +-
src/components/jeecg/comment/DataLogList.vue | 2 +-
src/components/jeecg/comment/MyComment.vue | 31 +-
src/components/jeecg/comment/UploadChunk.vue | 26 +-
src/components/jeecg/comment/useComment.ts | 55 +-
src/components/registerGlobComp.ts | 23 +-
src/design/ant/btn.less | 32 +-
src/design/ant/index.less | 105 +-
src/design/color.less | 2 +
src/design/entry.css | 181 +
src/design/index.less | 45 +-
src/enums/cacheEnum.ts | 9 +
src/enums/pageEnum.ts | 2 +
src/hooks/component/useFormItemSingle.ts | 50 +
src/hooks/core/onMountedOrActivated.ts | 10 +-
src/hooks/system/useMethods.ts | 4 +-
src/hooks/system/useThirdLogin.ts | 3 +
src/hooks/web/useECharts.ts | 2 +
src/hooks/web/useMessage.ts | 17 +
src/hooks/web/usePage.ts | 51 +-
src/hooks/web/useSso.ts | 5 +-
src/hooks/web/useTitle.ts | 49 +-
.../default/header/components/LockScreen.vue | 17 +-
.../header/components/lock/LockModal.vue | 3 +-
.../header/components/notify/index.vue | 3 +-
.../header/components/notify/index_old.vue | 2 +-
.../header/components/notify/notify.api.ts | 6 +
.../components/user-dropdown/DepartSelect.vue | 4 +-
.../user-dropdown/UpdatePassword.vue | 27 +-
.../header/components/user-dropdown/index.vue | 34 +-
src/layouts/default/header/index.vue | 18 +-
src/layouts/default/menu/index.vue | 7 +
.../setting/components/InputNumberItem.vue | 5 +
.../default/setting/components/SelectItem.vue | 5 +
.../default/setting/components/SwitchItem.vue | 5 +
.../setting/components/ThemeColorPicker.vue | 10 +-
src/layouts/default/sider/LayoutSider.vue | 2 +-
src/layouts/default/sider/index.vue | 2 +-
src/layouts/default/tabs/index.less | 2 -
src/layouts/default/tabs/index.vue | 8 +
src/layouts/default/tabs/tabs.theme.card.less | 4 +-
.../default/tabs/tabs.theme.smooth.less | 2 +-
src/locales/lang/en/layout.ts | 12 +-
src/locales/lang/zh-CN/layout.ts | 10 +
src/logics/theme/index.ts | 6 +
src/logics/theme/updateBackground.ts | 6 +
src/main.ts | 14 +-
src/router/constant.ts | 2 +-
src/router/guard/permissionGuard.ts | 76 +-
src/router/helper/routeHelper.ts | 10 +-
src/router/index.ts | 9 +
src/router/routes/modules/demo/comp.ts | 8 -
src/settings/componentSetting.ts | 2 +
src/settings/designSetting.ts | 15 +
src/settings/registerThirdComp.ts | 17 +-
src/settings/siteSetting.ts | 4 +-
src/store/modules/defIndex.ts | 75 +
src/store/modules/multipleTab.ts | 16 +
src/store/modules/permission.ts | 14 +-
src/store/modules/user.ts | 78 +-
src/utils/cache/persistent.ts | 2 +
src/utils/common/compUtils.ts | 159 +-
src/utils/common/renderUtils.ts | 29 +-
src/utils/dict/DictColors.js | 65 +
src/utils/dict/index.ts | 15 +-
src/utils/encryption/signMd5Utils.js | 1 +
src/utils/http/axios/index.ts | 32 +-
src/utils/index.ts | 62 +-
src/utils/propTypes.ts | 33 +-
src/utils/props.ts | 2 +-
.../Analysis/components/ChartGroupCard.vue | 10 +-
.../Analysis/components/SiteAnalysis.vue | 4 +-
.../Analysis/components/VisitAnalysis.vue | 2 +-
.../Analysis/components/VisitRadar.vue | 20 +-
src/views/dashboard/Analysis/data.ts | 2 -
.../dashboard/Analysis/homePage/IndexBdc.vue | 22 +-
.../dashboard/Analysis/homePage/IndexDef.vue | 7 +-
.../dashboard/Analysis/homePage/IndexTask.vue | 2 +-
src/views/dashboard/Analysis/index.vue | 4 +-
.../dashboard/ai/components/aide/index.vue | 85 +
src/views/dashboard/ai/index.vue | 26 +
.../workbench/components/SaleRadar.vue | 20 +-
src/views/demo/charts/SaleRadar.vue | 20 +-
.../document/form/BasicFiledsLayotForm.vue | 81 +
.../document/form/BasicFixedWidthForm.vue | 70 +
src/views/demo/document/form/BasicFormAdd.vue | 143 +
src/views/demo/document/form/BasicFormBtn.vue | 66 +
.../demo/document/form/BasicFormCleanRule.vue | 95 +
.../demo/document/form/BasicFormCompact.vue | 58 +
.../demo/document/form/BasicFormComponent.vue | 34 +
.../document/form/BasicFormConAttribute.vue | 63 +
.../demo/document/form/BasicFormCustom.vue | 32 +
.../form/BasicFormCustomComponent.vue | 32 +
.../document/form/BasicFormCustomSlots.vue | 64 +
.../document/form/BasicFormDynamicsRules.vue | 80 +
.../demo/document/form/BasicFormFieldShow.vue | 70 +
.../demo/document/form/BasicFormFieldTip.vue | 55 +
.../demo/document/form/BasicFormFooter.vue | 105 +
.../demo/document/form/BasicFormLayout.vue | 63 +
.../demo/document/form/BasicFormModal.vue | 84 +
.../demo/document/form/BasicFormRander.vue | 90 +
.../demo/document/form/BasicFormRules.vue | 58 +
.../demo/document/form/BasicFormSchemas.vue | 99 +
.../demo/document/form/BasicFormSearch.vue | 116 +
.../demo/document/form/BasicFormSlots.vue | 63 +
.../demo/document/form/BasicFormValue.vue | 94 +
.../demo/document/form/BasicFunctionForm.vue | 63 +
src/views/demo/document/form/example.data.ts | 393 +
.../demo/document/form/exampleCustom.data.ts | 452 +
src/views/demo/document/form/index.ts | 24 +
src/views/demo/document/form/tabIndex.vue | 114 +
.../demo/document/table/AuthColumnDemo.vue | 135 +
.../demo/document/table/BasicTableBorder.vue | 94 +
.../demo/document/table/BasicTableDemo.vue | 81 +
.../document/table/BasicTableDemoAjax.vue | 157 +
.../demo/document/table/CustomerCellDemo.vue | 106 +
.../demo/document/table/EditCellTableDemo.vue | 217 +
.../demo/document/table/EditRowTableDemo.vue | 261 +
.../demo/document/table/ExpandTableDemo.vue | 119 +
.../demo/document/table/ExportTableDemo.vue | 131 +
.../demo/document/table/FixedHeaderColumn.vue | 98 +
.../demo/document/table/InnerTableDemo.vue | 131 +
.../demo/document/table/MergeHeaderDemo.vue | 70 +
.../demo/document/table/MergeTableDemo.vue | 144 +
.../demo/document/table/SelectTableDemo.vue | 80 +
.../demo/document/table/TreeTableDemo.vue | 124 +
src/views/demo/document/table/index.ts | 15 +
src/views/demo/document/table/tabIndex.vue | 87 +
src/views/demo/form/RuleForm.vue | 2 +-
src/views/demo/form/index.vue | 1 +
.../demo/jeecg/JVxeTableDemo/JVxeDemo1.vue | 39 +-
.../demo/jeecg/JVxeTableDemo/JVxeDemo2.vue | 2 +-
src/views/demo/jeecg/JVxeTableDemo/index.vue | 7 +
.../demo/jeecg/Native/one/OneNativeList.vue | 5 +-
.../Native/one/components/OneNativeForm.vue | 2 +-
.../Native/one/components/OneNativeModal.vue | 2 +-
src/views/demo/jeecg/PrintDemo.vue | 2 +-
src/views/demo/jeecg/jeecgComponents.data.ts | 23 +-
src/views/demo/table/NestedTable.vue | 53 +-
src/views/demo/table/tableData.tsx | 36 +-
.../vextable/jvxetable/JVxeTableModal.vue | 82 +-
src/views/monitor/disk/gauge.vue | 2 +-
src/views/monitor/mynews/DetailModal.vue | 9 +-
src/views/monitor/mynews/DynamicNotice.vue | 2 +-
src/views/monitor/mynews/XssWhiteList.ts | 41 +
src/views/monitor/quartz/QuartzModal.vue | 5 +
src/views/monitor/route/RouteModal.vue | 12 +-
src/views/monitor/server/index.vue | 4 +-
src/views/report/chartdemo/index.vue | 6 +-
.../super/drag/page/components/CardList.vue | 473 -
.../drag/page/components/DragPageModal.vue | 187 -
.../super/drag/page/components/PageModal.vue | 71 -
.../drag/page/components/PasswordModal.vue | 105 -
src/views/super/drag/page/page.api.ts | 74 -
src/views/super/drag/page/page.data.ts | 66 -
src/views/super/drag/page/pageList.vue | 176 -
src/views/super/drag/page/useExportImage.ts | 65 -
src/views/super/drag/page/view.vue | 158 -
src/views/sys/about/index.vue | 3 +-
src/views/sys/login/LoginForm.vue | 6 +-
src/views/sys/login/OAuth2Login.vue | 5 +-
src/views/sys/login/ThirdModal.vue | 6 +-
src/views/sys/login/TokenLoginPage.vue | 27 +-
src/views/sys/login/useLogin.ts | 11 +-
src/views/sys/redirect/index.vue | 38 +-
.../address/components/DepartLeftTree.vue | 2 +-
src/views/system/address/index.vue | 2 +-
src/views/system/appconfig/ThirdApp.api.ts | 69 +
src/views/system/appconfig/ThirdApp.data.ts | 58 +
.../ThirdAppBindWeEnterpriseModal.vue | 316 +
.../system/appconfig/ThirdAppConfigList.vue | 140 +
.../system/appconfig/ThirdAppConfigModal.vue | 69 +
.../appconfig/ThirdAppDingTalkConfigForm.vue | 295 +
.../ThirdAppWeEnterpriseConfigForm.vue | 247 +
src/views/system/category/category.data.ts | 4 +-
.../category/components/CategoryModal.vue | 4 +-
src/views/system/checkRule/check.rule.data.ts | 4 +-
.../depart/components/DepartLeftTree.vue | 6 +-
.../components/DepartRoleInfoTab.vue | 2 +
.../components/DepartUserInfoTab.vue | 2 +
.../system/departUser/depart.user.data.ts | 4 +-
.../system/dict/components/DictItemList.vue | 14 +-
.../system/dict/components/DictItemModal.vue | 65 +-
src/views/system/dict/dict.data.ts | 19 +
src/views/system/dict/index.vue | 6 +-
src/views/system/examples/demo/DemoModal.vue | 2 +-
src/views/system/examples/demo/demo.data.ts | 3 +
src/views/system/fillRule/fill.rule.data.ts | 4 +-
src/views/system/loginmini/MiniCodelogin.vue | 2 +-
src/views/system/loginmini/MiniLogin.vue | 44 +-
src/views/system/loginmini/MiniRegister.vue | 4 +-
src/views/system/menu/DataRuleModal.vue | 2 +-
src/views/system/menu/MenuDrawer.vue | 4 +
src/views/system/menu/index.vue | 51 +
src/views/system/menu/menu.api.ts | 3 +
src/views/system/menu/menu.data.ts | 24 +-
.../message/components/SysMessageList.vue | 7 +
.../message/components/SysMessageModal.vue | 66 +-
.../message/components/useSysMessage.ts | 20 +-
src/views/system/message/template/index.vue | 1 +
src/views/system/notice/DetailModal.vue | 2 +-
src/views/system/notice/index.vue | 4 +-
src/views/system/notice/notice.data.ts | 22 +-
.../system/onlineuser/OnlineUserList.vue | 2 +
src/views/system/position/index.vue | 7 +-
src/views/system/role/TenantRoleList.vue | 26 +-
.../role/components/RolePermissionDrawer.vue | 29 +-
.../system/role/components/RoleUserTable.vue | 18 +-
.../system/role/components/UseSelectModal.vue | 4 +-
src/views/system/role/index.vue | 6 +-
src/views/system/role/role.api.ts | 19 +-
.../tableWhiteList/SysTableWhiteList.api.ts | 69 +
.../tableWhiteList/SysTableWhiteList.data.ts | 76 +
.../tableWhiteList/SysTableWhiteListList.vue | 168 +
.../modules/SysTableWhiteListModal.vue | 67 +
.../{user => tenant}/TenantUserList.vue | 131 +-
.../TenantInviteUserModal.vue | 1 +
.../tenant/{ => components}/TenantModal.vue | 4 +-
.../TenantRecycleBinModal.vue | 5 +-
.../tenant/components/TenantUserDrawer.vue | 100 +
.../TenantUserList.vue} | 20 +-
.../components/TenantUserSelectModal.vue | 159 +
src/views/system/tenant/index.vue | 16 +-
src/views/system/tenant/my/MyTenantList.vue | 146 +
.../tenant/pack/TenantDefaultPackList.vue | 140 +
.../TenantPackList.vue} | 64 +-
.../tenant/{ => pack}/TenantPackMenuModal.vue | 29 +-
.../tenant/{ => pack}/TenantPackUserModal.vue | 33 +-
src/views/system/tenant/tenant.api.ts | 39 +
src/views/system/tenant/tenant.data.ts | 68 +-
src/views/system/user/UserAgentModal.vue | 2 +-
src/views/system/user/UserDrawer.vue | 7 +-
src/views/system/user/UserQuitAgentModal.vue | 21 +-
src/views/system/user/index.vue | 16 +-
src/views/system/user/user.api.ts | 42 +-
src/views/system/user/user.data.ts | 31 +-
.../system/usersetting/AccountSetting.vue | 319 +-
src/views/system/usersetting/BaseSetting.vue | 304 +-
.../system/usersetting/TenantSetting.vue | 347 +-
.../system/usersetting/UserSetting.api.ts | 36 +
.../system/usersetting/UserSetting.data.ts | 29 +-
src/views/system/usersetting/UserSetting.vue | 111 +-
.../system/usersetting/WeChatDingSetting.vue | 261 +-
.../commponents/UserPhoneModal.vue | 12 +-
.../system/usersetting/icons/anquan1.png | Bin 0 -> 3630 bytes
.../system/usersetting/icons/anquan2.png | Bin 0 -> 3915 bytes
src/views/system/usersetting/icons/app1.png | Bin 0 -> 2865 bytes
src/views/system/usersetting/icons/app2.png | Bin 0 -> 3057 bytes
src/views/system/usersetting/icons/geren1.png | Bin 0 -> 2539 bytes
src/views/system/usersetting/icons/geren2.png | Bin 0 -> 2695 bytes
src/views/system/usersetting/icons/zuhu1.png | Bin 0 -> 4075 bytes
src/views/system/usersetting/icons/zuhu2.png | Bin 0 -> 4228 bytes
src/views/yx/yxArticle/YxArticleList.vue | 14 +-
.../yx/yxArticle/components/YxArticleForm.vue | 1 +
src/views/yx/yxFeedback/YxFeedback.api.ts | 64 +
src/views/yx/yxFeedback/YxFeedback.data.ts | 91 +
src/views/yx/yxFeedback/YxFeedbackList.vue | 173 +
.../yxFeedback/components/YxFeedbackForm.vue | 70 +
.../yxFeedback/components/YxFeedbackModal.vue | 66 +
.../YxHistoryMajorEnroll.data.ts | 296 +-
.../YxHistoryMajorEnrollList-s.vue | 223 +
.../YxHistoryMajorEnrollList.vue | 2 +-
.../YxSchoolDoubleFirstPlan.api.ts | 64 +
.../YxSchoolDoubleFirstPlan.data.ts | 111 +
.../YxSchoolDoubleFirstPlanList.vue | 173 +
.../YxSchoolDoubleFirstPlanForm.vue | 70 +
.../YxSchoolDoubleFirstPlanModal.vue | 66 +
.../YxSubjectEvaluation.api.ts | 64 +
.../YxSubjectEvaluation.data.ts | 101 +
.../YxSubjectEvaluationList.vue | 173 +
.../components/YxSubjectEvaluationForm.vue | 70 +
.../components/YxSubjectEvaluationModal.vue | 66 +
src/views/yx/yxVipCard/YxVipCard.data.ts | 17 +
src/views/yx/yxVipCard/YxVipCardList.vue | 305 +-
star.bat | 1 -
tsconfig.json | 6 +-
types/global.d.ts | 5 -
vite.config.ts | 53 +-
windi.config.ts | 74 -
460 files changed, 21801 insertions(+), 10754 deletions(-)
delete mode 100644 build/vite/plugin/pwa.ts
delete mode 100644 public/resource/img/pwa-192x192.png
delete mode 100644 public/resource/img/pwa-512x512.png
create mode 100644 src/assets/images/department.png
create mode 100644 src/assets/images/drag_cover.png
create mode 100644 src/assets/images/people.png
create mode 100644 src/assets/images/process_no_form.png
create mode 100644 src/assets/images/setting.png
create mode 100644 src/assets/images/template_cover.jpg
create mode 100644 src/assets/images/wallet.png
create mode 100644 src/assets/loginmini/icon/jeecg_logo-old.png
create mode 100644 src/assets/loginmini/icon/logo-old.png
create mode 100644 src/assets/loginmini/icon/yitisheng (1).png
create mode 100644 src/assets/svg/fileType/image.png
delete mode 100644 src/components/CodeEditor/src/json-preview/JsonPreview.vue
create mode 100644 src/components/Form/src/jeecg/components/JPopupDict.vue
create mode 100644 src/components/Form/src/jeecg/components/roleSelect/RoleSelectInput.vue
create mode 100644 src/components/Form/src/jeecg/components/userSelect/useUserSelect.ts
create mode 100644 src/components/Form/src/jeecg/hooks/useCodeHinting.ts
rename src/components/chart/{Line.vue => SingleLine.vue} (98%)
create mode 100644 src/components/jeecg/AiChat/assets/avatar.jpg
create mode 100644 src/components/jeecg/AiChat/components/chat.vue
create mode 100644 src/components/jeecg/AiChat/components/chatMessage.vue
create mode 100644 src/components/jeecg/AiChat/components/chatText.vue
create mode 100644 src/components/jeecg/AiChat/components/slide.vue
create mode 100644 src/components/jeecg/AiChat/data.js
create mode 100644 src/components/jeecg/AiChat/hooks/useChat.ts
create mode 100644 src/components/jeecg/AiChat/hooks/useScroll.ts
create mode 100644 src/components/jeecg/AiChat/index.vue
create mode 100644 src/components/jeecg/AiChat/style/github-markdown.less
create mode 100644 src/components/jeecg/AiChat/style/highlight.less
create mode 100644 src/components/jeecg/AiChat/style/style.less
create mode 100644 src/design/entry.css
create mode 100644 src/hooks/component/useFormItemSingle.ts
create mode 100644 src/store/modules/defIndex.ts
create mode 100644 src/utils/dict/DictColors.js
create mode 100644 src/views/dashboard/ai/components/aide/index.vue
create mode 100644 src/views/dashboard/ai/index.vue
create mode 100644 src/views/demo/document/form/BasicFiledsLayotForm.vue
create mode 100644 src/views/demo/document/form/BasicFixedWidthForm.vue
create mode 100644 src/views/demo/document/form/BasicFormAdd.vue
create mode 100644 src/views/demo/document/form/BasicFormBtn.vue
create mode 100644 src/views/demo/document/form/BasicFormCleanRule.vue
create mode 100644 src/views/demo/document/form/BasicFormCompact.vue
create mode 100644 src/views/demo/document/form/BasicFormComponent.vue
create mode 100644 src/views/demo/document/form/BasicFormConAttribute.vue
create mode 100644 src/views/demo/document/form/BasicFormCustom.vue
create mode 100644 src/views/demo/document/form/BasicFormCustomComponent.vue
create mode 100644 src/views/demo/document/form/BasicFormCustomSlots.vue
create mode 100644 src/views/demo/document/form/BasicFormDynamicsRules.vue
create mode 100644 src/views/demo/document/form/BasicFormFieldShow.vue
create mode 100644 src/views/demo/document/form/BasicFormFieldTip.vue
create mode 100644 src/views/demo/document/form/BasicFormFooter.vue
create mode 100644 src/views/demo/document/form/BasicFormLayout.vue
create mode 100644 src/views/demo/document/form/BasicFormModal.vue
create mode 100644 src/views/demo/document/form/BasicFormRander.vue
create mode 100644 src/views/demo/document/form/BasicFormRules.vue
create mode 100644 src/views/demo/document/form/BasicFormSchemas.vue
create mode 100644 src/views/demo/document/form/BasicFormSearch.vue
create mode 100644 src/views/demo/document/form/BasicFormSlots.vue
create mode 100644 src/views/demo/document/form/BasicFormValue.vue
create mode 100644 src/views/demo/document/form/BasicFunctionForm.vue
create mode 100644 src/views/demo/document/form/example.data.ts
create mode 100644 src/views/demo/document/form/exampleCustom.data.ts
create mode 100644 src/views/demo/document/form/index.ts
create mode 100644 src/views/demo/document/form/tabIndex.vue
create mode 100644 src/views/demo/document/table/AuthColumnDemo.vue
create mode 100644 src/views/demo/document/table/BasicTableBorder.vue
create mode 100644 src/views/demo/document/table/BasicTableDemo.vue
create mode 100644 src/views/demo/document/table/BasicTableDemoAjax.vue
create mode 100644 src/views/demo/document/table/CustomerCellDemo.vue
create mode 100644 src/views/demo/document/table/EditCellTableDemo.vue
create mode 100644 src/views/demo/document/table/EditRowTableDemo.vue
create mode 100644 src/views/demo/document/table/ExpandTableDemo.vue
create mode 100644 src/views/demo/document/table/ExportTableDemo.vue
create mode 100644 src/views/demo/document/table/FixedHeaderColumn.vue
create mode 100644 src/views/demo/document/table/InnerTableDemo.vue
create mode 100644 src/views/demo/document/table/MergeHeaderDemo.vue
create mode 100644 src/views/demo/document/table/MergeTableDemo.vue
create mode 100644 src/views/demo/document/table/SelectTableDemo.vue
create mode 100644 src/views/demo/document/table/TreeTableDemo.vue
create mode 100644 src/views/demo/document/table/index.ts
create mode 100644 src/views/demo/document/table/tabIndex.vue
create mode 100644 src/views/monitor/mynews/XssWhiteList.ts
delete mode 100644 src/views/super/drag/page/components/CardList.vue
delete mode 100644 src/views/super/drag/page/components/DragPageModal.vue
delete mode 100644 src/views/super/drag/page/components/PageModal.vue
delete mode 100644 src/views/super/drag/page/components/PasswordModal.vue
delete mode 100644 src/views/super/drag/page/page.api.ts
delete mode 100644 src/views/super/drag/page/page.data.ts
delete mode 100644 src/views/super/drag/page/pageList.vue
delete mode 100644 src/views/super/drag/page/useExportImage.ts
delete mode 100644 src/views/super/drag/page/view.vue
create mode 100644 src/views/system/appconfig/ThirdApp.api.ts
create mode 100644 src/views/system/appconfig/ThirdApp.data.ts
create mode 100644 src/views/system/appconfig/ThirdAppBindWeEnterpriseModal.vue
create mode 100644 src/views/system/appconfig/ThirdAppConfigList.vue
create mode 100644 src/views/system/appconfig/ThirdAppConfigModal.vue
create mode 100644 src/views/system/appconfig/ThirdAppDingTalkConfigForm.vue
create mode 100644 src/views/system/appconfig/ThirdAppWeEnterpriseConfigForm.vue
create mode 100644 src/views/system/tableWhiteList/SysTableWhiteList.api.ts
create mode 100644 src/views/system/tableWhiteList/SysTableWhiteList.data.ts
create mode 100644 src/views/system/tableWhiteList/SysTableWhiteListList.vue
create mode 100644 src/views/system/tableWhiteList/modules/SysTableWhiteListModal.vue
rename src/views/system/{user => tenant}/TenantUserList.vue (54%)
rename src/views/system/tenant/{ => components}/TenantInviteUserModal.vue (97%)
rename src/views/system/tenant/{ => components}/TenantModal.vue (93%)
rename src/views/system/tenant/{ => components}/TenantRecycleBinModal.vue (97%)
create mode 100644 src/views/system/tenant/components/TenantUserDrawer.vue
rename src/views/system/tenant/{TenantUserModal.vue => components/TenantUserList.vue} (77%)
create mode 100644 src/views/system/tenant/components/TenantUserSelectModal.vue
create mode 100644 src/views/system/tenant/my/MyTenantList.vue
create mode 100644 src/views/system/tenant/pack/TenantDefaultPackList.vue
rename src/views/system/tenant/{TenantPackModal.vue => pack/TenantPackList.vue} (82%)
rename src/views/system/tenant/{ => pack}/TenantPackMenuModal.vue (52%)
rename src/views/system/tenant/{ => pack}/TenantPackUserModal.vue (84%)
create mode 100644 src/views/system/usersetting/icons/anquan1.png
create mode 100644 src/views/system/usersetting/icons/anquan2.png
create mode 100644 src/views/system/usersetting/icons/app1.png
create mode 100644 src/views/system/usersetting/icons/app2.png
create mode 100644 src/views/system/usersetting/icons/geren1.png
create mode 100644 src/views/system/usersetting/icons/geren2.png
create mode 100644 src/views/system/usersetting/icons/zuhu1.png
create mode 100644 src/views/system/usersetting/icons/zuhu2.png
create mode 100644 src/views/yx/yxFeedback/YxFeedback.api.ts
create mode 100644 src/views/yx/yxFeedback/YxFeedback.data.ts
create mode 100644 src/views/yx/yxFeedback/YxFeedbackList.vue
create mode 100644 src/views/yx/yxFeedback/components/YxFeedbackForm.vue
create mode 100644 src/views/yx/yxFeedback/components/YxFeedbackModal.vue
create mode 100644 src/views/yx/yxHistoryMajorEnroll/YxHistoryMajorEnrollList-s.vue
create mode 100644 src/views/yx/yxSchoolDoubleFirstPlan/YxSchoolDoubleFirstPlan.api.ts
create mode 100644 src/views/yx/yxSchoolDoubleFirstPlan/YxSchoolDoubleFirstPlan.data.ts
create mode 100644 src/views/yx/yxSchoolDoubleFirstPlan/YxSchoolDoubleFirstPlanList.vue
create mode 100644 src/views/yx/yxSchoolDoubleFirstPlan/components/YxSchoolDoubleFirstPlanForm.vue
create mode 100644 src/views/yx/yxSchoolDoubleFirstPlan/components/YxSchoolDoubleFirstPlanModal.vue
create mode 100644 src/views/yx/yxSubjectEvaluation/YxSubjectEvaluation.api.ts
create mode 100644 src/views/yx/yxSubjectEvaluation/YxSubjectEvaluation.data.ts
create mode 100644 src/views/yx/yxSubjectEvaluation/YxSubjectEvaluationList.vue
create mode 100644 src/views/yx/yxSubjectEvaluation/components/YxSubjectEvaluationForm.vue
create mode 100644 src/views/yx/yxSubjectEvaluation/components/YxSubjectEvaluationModal.vue
delete mode 100644 star.bat
delete mode 100644 windi.config.ts
diff --git a/.env b/.env
index 77cc403..2ce4490 100644
--- a/.env
+++ b/.env
@@ -2,10 +2,10 @@
VITE_PORT = 3100
# 网站标题
-VITE_GLOB_APP_TITLE = 后台管理系统
+VITE_GLOB_APP_TITLE = 艺体志愿宝 管理平台
# 简称,用于配置文件名字 不要出现空格、数字开头等特殊字符
-VITE_GLOB_APP_SHORT_NAME = JeecgBootAdmin
+VITE_GLOB_APP_SHORT_NAME = YitishengAdmin
# 单点登录服务端地址
VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas
diff --git a/.env.development b/.env.development
index d7894be..01a48a9 100644
--- a/.env.development
+++ b/.env.development
@@ -4,17 +4,14 @@ VITE_USE_MOCK = true
# 发布路径
VITE_PUBLIC_PATH = /
+
# 跨域代理,您可以配置多个 ,请注意,没有换行符
VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-# 控制台不输出
-VITE_DROP_CONSOLE = false
-
-#后台接口父地址(必填)
-VITE_GLOB_API_URL=/jeecgboot
-
#后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot/
+#后台接口父地址(必填)
+VITE_GLOB_API_URL=http://localhost:8080/jeecg-boot/
# 接口前缀
VITE_GLOB_API_URL_PREFIX=
diff --git a/.env.production b/.env.production
index de33204..098787c 100644
--- a/.env.production
+++ b/.env.production
@@ -4,9 +4,6 @@ VITE_USE_MOCK = true
# 发布路径
VITE_PUBLIC_PATH = /
-# 控制台不输出
-VITE_DROP_CONSOLE = true
-
# 是否启用gzip或brotli压缩
# 选项值: gzip | brotli | none
# 如果需要多个可以使用“,”分隔
@@ -16,19 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
#后台接口父地址(必填)
-VITE_GLOB_API_URL=/jeecgboot
-
+VITE_GLOB_API_URL=https://yitisheng.vip/jbttest
#后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:8080/jeecg-boot
+VITE_GLOB_DOMAIN_URL=https://yitisheng.vip/jbttest
+
# 接口父路径前缀
VITE_GLOB_API_URL_PREFIX=
-
-# 是否启用图像压缩
-VITE_USE_IMAGEMIN= true
-
-# 使用pwa
-VITE_USE_PWA = false
-
-# 是否兼容旧浏览器
-VITE_LEGACY = false
diff --git a/.gitignore b/.gitignore
index a0b9717..6aef0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ pnpm-debug.log*
# Editor directories and files
.idea
+.svn
# .vscode
*.suo
*.ntvs*
@@ -29,6 +30,7 @@ pnpm-debug.log*
*.sln
*.sw?
/os_del.cmd
+os_del.cmd
/.vscode/
/.history/
/svn clear.bat
diff --git a/LICENSE b/LICENSE
index ea32b1c..7afdd65 100644
--- a/LICENSE
+++ b/LICENSE
@@ -23,7 +23,7 @@ SOFTWARE.
开源协议补充
- JeecgBoot 是由 北京敲敲云科技有限公司 发行的软件。 总部位于北京,地址:中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱:jeecgos@163.com
+ JeecgBoot 是由 北京国炬信息技术有限公司 发行的软件。 总部位于北京,地址:中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱:jeecgos@163.com
本软件受适用的国家软件著作权法(包括国际条约)和双重保护许可。
1.允许基于本平台软件开展业务系统开发。
@@ -32,4 +32,6 @@ SOFTWARE.
违反此条款属于侵权行为,须赔偿侵权经济损失,同时立即停止著作权侵权行为。
总结:在遵循Apache开源协议和开源协议补充条款下,允许商用使用,不会造成侵权行为!
- 解释权归:http://www.jeecg.com
+ 解释权归:
+ http://www.jeecg.com
+ http://guojusoft.com
diff --git a/README.md b/README.md
index 9f5dd48..aae3564 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
JEECG BOOT 低代码开发平台(Vue3前端)
===============
-当前最新版本: 3.5.3(发布时间:2023-07-24)
+当前最新版本: 3.6.3(发布时间:2024-03-11)
[](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
-[](http://www.jeecg.com)
+[](http://jeecg.com/aboutusIndex)
[](https://jeecg.blog.csdn.net)
-[](https://github.com/zhangdaiscott/jeecg-boot)
+[](https://github.com/zhangdaiscott/jeecg-boot)
[](https://github.com/zhangdaiscott/jeecg-boot)
[](https://github.com/zhangdaiscott/jeecg-boot)
## 简介
-JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue3、TypeScript 等新技术方案,包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能。
+JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue4、TypeScript 等新技术方案,包括二次封装组件、utils、hooks、动态菜单、权限校验、按钮级别权限控制等功能。
是采用Vben实现的 JeecgBoot低代码平台的全新vue3版本。
> 强大的代码生成器让前后端代码一键生成! JeecgBoot引领低代码开发模式(OnlineCoding-> 代码生成-> 手工MERGE), 帮助解决Java项目70%的重复工作,让开发更多关注业务。既能快速提高效率,节省成本,同时又不失灵活性
@@ -31,10 +31,10 @@ JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue3、TypeScript 等新技术
##### 项目说明
-| 项目名 | 说明 |
-|--------------------|------------------------|
-| `jeecgboot-vue3` | Vue3版前端代码 |
-| `jeecg-boot` | SpringBoot后台项目(支持微服务) |
+| 项目名 | 说明 |
+|--------------------|-----------------------------------------|
+| `jeecgboot-vue3` | 前端源码Vue3版下载 |
+| `jeecg-boot` | 后端JAVA源码下载(SpringBoot+SpringCloud) |
## 开发环境搭建
@@ -44,11 +44,11 @@ JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue3、TypeScript 等新技术
## 技术文档
-- 官方文档:[http://help.jeecg.com](http://help.jeecg.com)
-- 官方网站: [http://www.jeecg.com](http://www.jeecg.com)
+- 官方文档:[https://help.jeecg.com](https://help.jeecg.com)
+- 官方网站: [https://www.jeecg.com](https://www.jeecg.com)
- 快速入门:[快速入门](http://jeecg.com/doc/quickstart) | [常见问题](http://help.jeecg.com/qa.html) | [视频教程](https://www.bilibili.com/video/BV1V34y187Y9 "入门视频") | [ 代码生成](http://help.jeecg.com/vue3/codegen/online.html)
-- QQ交流群:⑦791696430、683903138
-- 在线演示 : [Vue3演示](http://boot3.jeecg.com) | [Vue2演示](http://boot3.jeecg.com) | [APP演示](http://jeecg.com/appIndex)
+- QQ交流群:⑧825232878、⑦791696430(满)、683903138(满)
+- 在线演示 : [Vue3演示](http://boot3.jeecg.com) | [APP演示](http://jeecg.com/appIndex)| [敲敲云零代码](https://www.qiaoqiaoyun.com)
> 演示系统的登录账号密码,请点击 [获取账号密码](http://jeecg.com/doc/demo) 获取
diff --git a/build/generate/generateModifyVars.ts b/build/generate/generateModifyVars.ts
index 44670e2..705d339 100644
--- a/build/generate/generateModifyVars.ts
+++ b/build/generate/generateModifyVars.ts
@@ -1,11 +1,21 @@
-import { generateAntColors, primaryColor } from '../config/themeConfig';
-import { getThemeVariables } from 'ant-design-vue/dist/theme';
+import { primaryColor } from '../config/themeConfig';
+// import { getThemeVariables } from 'ant-design-vue/dist/theme';
import { resolve } from 'path';
+import { generate } from '@ant-design/colors';
+import { theme } from 'ant-design-vue/lib';
+import convertLegacyToken from 'ant-design-vue/lib/theme/convertLegacyToken';
+const { defaultAlgorithm, defaultSeed } = theme;
+
+function generateAntColors(color: string, theme: 'default' | 'dark' = 'default') {
+ return generate(color, {
+ theme,
+ });
+}
/**
* less global variable
*/
-export function generateModifyVars(dark = false) {
+export function generateModifyVars() {
const palettes = generateAntColors(primaryColor);
const primary = palettes[5];
@@ -15,12 +25,14 @@ export function generateModifyVars(dark = false) {
primaryColorObj[`primary-${index + 1}`] = palettes[index];
}
- const modifyVars = getThemeVariables({ dark });
+ const mapToken = defaultAlgorithm(defaultSeed);
+ const v3Token = convertLegacyToken(mapToken);
return {
- ...modifyVars,
+ ...v3Token,
+ // ...modifyVars,
// Used for global import to avoid the need to import each style file separately
// reference: Avoid repeated references
- hack: `${modifyVars.hack} @import (reference) "${resolve('src/design/config.less')}";`,
+ hack: `true; @import (reference) "${resolve('src/design/config.less')}";`,
'primary-color': primary,
...primaryColorObj,
'info-color': primary,
diff --git a/build/script/buildConf.ts b/build/script/buildConf.ts
index 0c8089c..1892af3 100644
--- a/build/script/buildConf.ts
+++ b/build/script/buildConf.ts
@@ -1,5 +1,5 @@
/**
- * Generate additional configuration files when used for packaging. The file can be configured with some global variables, so that it can be changed directly externally without repackaging
+ * 生成外部配置文件,用于生产发布后配置,无需重新打包
*/
import { GLOB_CONFIG_FILE_NAME, OUTPUT_DIR } from '../constant';
import fs, { writeFileSync } from 'fs-extra';
diff --git a/build/vite/plugin/compress.ts b/build/vite/plugin/compress.ts
index 987f127..a76d3f8 100644
--- a/build/vite/plugin/compress.ts
+++ b/build/vite/plugin/compress.ts
@@ -13,6 +13,10 @@ export function configCompressPlugin(compress: 'gzip' | 'brotli' | 'none', delet
if (compressList.includes('gzip')) {
plugins.push(
compressPlugin({
+ verbose: true,
+ disable: false,
+ threshold: 10240,
+ algorithm: 'gzip',
ext: '.gz',
deleteOriginFile,
})
diff --git a/build/vite/plugin/html.ts b/build/vite/plugin/html.ts
index 6af034a..bf5b5a6 100644
--- a/build/vite/plugin/html.ts
+++ b/build/vite/plugin/html.ts
@@ -19,11 +19,11 @@ export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
const htmlPlugin: PluginOption[] = createHtmlPlugin({
minify: isBuild,
inject: {
- // Inject data into ejs template
+ // 修改模板html的标题
data: {
title: VITE_GLOB_APP_TITLE,
},
- // Embed the generated app.config.js file
+ // 将app.config.js文件注入到模板html中
tags: isBuild
? [
{
diff --git a/build/vite/plugin/imagemin.ts b/build/vite/plugin/imagemin.ts
index a023573..785b65a 100644
--- a/build/vite/plugin/imagemin.ts
+++ b/build/vite/plugin/imagemin.ts
@@ -1,3 +1,4 @@
+// 【图片压缩插件】
// Image resource files used to compress the output of the production environment
// https://github.com/anncwb/vite-plugin-imagemin
import viteImagemin from 'vite-plugin-imagemin';
diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts
index 5362a89..25df01e 100644
--- a/build/vite/plugin/index.ts
+++ b/build/vite/plugin/index.ts
@@ -1,27 +1,26 @@
import { PluginOption } from 'vite';
import vue from '@vitejs/plugin-vue';
import vueJsx from '@vitejs/plugin-vue-jsx';
-import legacy from '@vitejs/plugin-legacy';
import purgeIcons from 'vite-plugin-purge-icons';
-import windiCSS from 'vite-plugin-windicss';
+import UnoCSS from 'unocss/vite';
+import { presetTypography, presetUno } from 'unocss';
+
+// 本地调试https配置方法
import VitePluginCertificate from 'vite-plugin-mkcert';
-//update-begin-author:liusq date:2023-06-06 for: [issues/555]开发环境,vscode断点调试,文件或行数对不上
+//[issues/555]开发环境,vscode断点调试,文件或行数对不上
import vueSetupExtend from 'vite-plugin-vue-setup-extend-plus';
-//update-end-author:liusq date:2023-06-06 for: [issues/555]开发环境,vscode断点调试,文件或行数对不上
import { configHtmlPlugin } from './html';
-import { configPwaConfig } from './pwa';
import { configMockPlugin } from './mock';
import { configCompressPlugin } from './compress';
-import { configStyleImportPlugin } from './styleImport';
import { configVisualizerConfig } from './visualizer';
import { configThemePlugin } from './theme';
-import { configImageminPlugin } from './imagemin';
import { configSvgIconsPlugin } from './svgSprite';
-import OptimizationPersist from 'vite-plugin-optimize-persist'
-import PkgConfig from 'vite-plugin-package-config'
+// //预编译加载插件(不支持vite3作废)
+// import OptimizationPersist from 'vite-plugin-optimize-persist';
+// import PkgConfig from 'vite-plugin-package-config';
export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
- const { VITE_USE_IMAGEMIN, VITE_USE_MOCK, VITE_LEGACY, VITE_BUILD_COMPRESS, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE } = viteEnv;
+ const { VITE_USE_MOCK, VITE_BUILD_COMPRESS, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE } = viteEnv;
const vitePlugins: (PluginOption | PluginOption[])[] = [
// have to
@@ -36,11 +35,7 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
}),
];
- // vite-plugin-windicss
- vitePlugins.push(windiCSS());
-
- // @vitejs/plugin-legacy
- VITE_LEGACY && isBuild && vitePlugins.push(legacy());
+ vitePlugins.push(UnoCSS({ presets: [presetUno(), presetTypography()] }));
// vite-plugin-html
vitePlugins.push(configHtmlPlugin(viteEnv, isBuild));
@@ -54,9 +49,6 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
// vite-plugin-purge-icons
vitePlugins.push(purgeIcons());
- // vite-plugin-style-import
- vitePlugins.push(configStyleImportPlugin(isBuild));
-
// rollup-plugin-visualizer
vitePlugins.push(configVisualizerConfig());
@@ -65,18 +57,14 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
// The following plugins only work in the production environment
if (isBuild) {
- // vite-plugin-imagemin
- VITE_USE_IMAGEMIN && vitePlugins.push(configImageminPlugin());
-
+
// rollup-plugin-gzip
vitePlugins.push(configCompressPlugin(VITE_BUILD_COMPRESS, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE));
- // vite-plugin-pwa
- vitePlugins.push(configPwaConfig(viteEnv));
}
- //vite-plugin-theme【解决vite首次打开界面加载慢问题】
- vitePlugins.push(PkgConfig());
- vitePlugins.push(OptimizationPersist());
+ // //vite-plugin-theme【预编译加载插件,解决vite首次打开界面加载慢问题】
+ // vitePlugins.push(PkgConfig());
+ // vitePlugins.push(OptimizationPersist());
return vitePlugins;
}
diff --git a/build/vite/plugin/pwa.ts b/build/vite/plugin/pwa.ts
deleted file mode 100644
index a102cad..0000000
--- a/build/vite/plugin/pwa.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Zero-config PWA for Vite
- * https://github.com/antfu/vite-plugin-pwa
- * vite-plugin-pwa是vite的一个官方插件,它的功能就是通过简单的配置将你的vite项目变成pwa应用
- */
-import { VitePWA } from 'vite-plugin-pwa';
-
-export function configPwaConfig(env: ViteEnv) {
- const { VITE_USE_PWA, VITE_GLOB_APP_TITLE, VITE_GLOB_APP_SHORT_NAME } = env;
-
- if (VITE_USE_PWA) {
- // vite-plugin-pwa
- const pwaPlugin = VitePWA({
- manifest: {
- name: VITE_GLOB_APP_TITLE,
- short_name: VITE_GLOB_APP_SHORT_NAME,
- icons: [
- {
- src: './resource/img/pwa-192x192.png',
- sizes: '192x192',
- type: 'image/png',
- },
- {
- src: './resource/img/pwa-512x512.png',
- sizes: '512x512',
- type: 'image/png',
- },
- ],
- },
- });
- return pwaPlugin;
- }
- return [];
-}
diff --git a/build/vite/plugin/styleImport.ts b/build/vite/plugin/styleImport.ts
index da1499d..30d5874 100644
--- a/build/vite/plugin/styleImport.ts
+++ b/build/vite/plugin/styleImport.ts
@@ -1,4 +1,5 @@
/**
+ * 【样式按需加载插件 ——主要处理antd的样式】
* Introduces component library styles on demand.
* https://github.com/anncwb/vite-plugin-style-import
*/
diff --git a/build/vite/plugin/theme.ts b/build/vite/plugin/theme.ts
index f9a10c3..542769d 100644
--- a/build/vite/plugin/theme.ts
+++ b/build/vite/plugin/theme.ts
@@ -57,7 +57,7 @@ export function configThemePlugin(isBuild: boolean): PluginOption[] {
vite_theme_plugin,
antdDarkThemePlugin({
preloadFiles: [
- path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/antd.less'),
+ // path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/reset.css'),
//path.resolve(process.cwd(), 'node_modules/ant-design-vue/dist/antd.dark.less'),
path.resolve(process.cwd(), 'src/design/index.less'),
],
diff --git a/index.html b/index.html
index c80afd8..ef61a19 100644
--- a/index.html
+++ b/index.html
@@ -166,5 +166,16 @@
+
+
+