diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index b6d1b8dd..b1b83cdb 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -10,63 +10,65 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@antv/data-set": "^0.11.4", - "@jeecg/antd-online-mini": "2.4.5-RC", - "@jiaminghi/data-view": "^2.10.0", - "@tinymce/tinymce-vue": "^2.1.0", - "@toast-ui/editor": "^2.1.2", "ant-design-vue": "^1.7.2", - "area-data": "^5.0.6", - "axios": "^0.27.2", - "clipboard": "^2.0.10", - "codemirror": "^5.65.1", - "cron-parser": "^2.10.0", + "@antv/data-set": "^0.11.4", + "viser-vue": "^2.4.8", + "axios": "^0.18.0", "dayjs": "^1.8.0", - "dircountdown": "^1.1.0", - "dom-align": "1.12.0", - "echarts": "^5.3.0", - "element-ui": "^2.15.6", "enquire.js": "^2.1.6", - "jquery": "^3.6.0", "js-cookie": "^2.2.0", "lodash.get": "^4.4.2", "lodash.pick": "^4.4.0", "md5": "^2.2.1", "nprogress": "^0.2.0", - "qs": "^6.10.3", - "tinymce": "^5.10.3", - "viser-vue": "^2.4.8", "vue": "^2.6.10", - "vue-area-linkage": "^5.1.0", "vue-cropper": "^0.5.4", - "vue-i18n": "^8.27.0", + "vue-i18n": "^8.7.0", "vue-loader": "^15.7.0", "vue-ls": "^3.2.0", - "vue-photo-preview": "^1.0.9", - "vue-print-nb": "^1.7.5", - "vue-print-nb-jeecg": "^1.0.9", "vue-router": "^3.0.1", + "vuex": "^3.1.0", + "vue-print-nb-jeecg": "^1.0.10", + "clipboard": "^2.0.4", + "vue-photo-preview": "^1.1.3", "vue-splitpane": "^1.0.4", "vuedraggable": "^2.20.0", - "vuex": "^3.1.0", + "codemirror": "^5.46.0", + "@tinymce/tinymce-vue": "2.1.0", + "tinymce": "5.4.1", + "@toast-ui/editor": "^2.1.2", + "vue-area-linkage": "^5.1.0", + "china-area-data": "^5.0.1", + "dom-align": "1.12.0", + "xe-utils": "2.4.8", "vxe-table": "2.9.13", "vxe-table-plugin-antd": "1.8.10", - "xe-utils": "2.4.8" + "cron-parser": "^2.10.0", + "qiankun": "^2.5.1", + "xss": "^1.0.13", + + "@jiaminghi/data-view": "^2.10.0", + "area-data": "^5.0.6", + "dircountdown": "^1.1.0", + "echarts": "^5.3.0", + "element-ui": "^2.15.6", + "jquery": "^3.6.0", + "qs": "^6.10.3" }, "devDependencies": { "@babel/polyfill": "^7.2.5", "@vue/cli-plugin-babel": "^3.3.0", - "@vue/cli-plugin-eslint": "^5.0.8", - "@vue/cli-service": "^5.0.8", + "@vue/cli-plugin-eslint": "^3.3.0", + "@vue/cli-service": "^3.3.0", "@vue/eslint-config-standard": "^4.0.0", "babel-eslint": "7.2.3", - "compression-webpack-plugin": "^10.0.0", "eslint": "^5.16.0", "eslint-plugin-vue": "^5.1.0", - "html-webpack-plugin": "^4.2.0", "less": "^3.9.0", "less-loader": "^4.1.0", - "vue-template-compiler": "^2.6.10" + "vue-template-compiler": "^2.6.10", + "html-webpack-plugin": "^4.2.0", + "compression-webpack-plugin": "^3.1.0" }, "eslintConfig": { "root": true, @@ -104,10 +106,7 @@ "vue/html-closing-bracket-newline": 0, "vue/no-parsing-error": 0, "no-tabs": 0, - "indent": [ - "off", - 2 - ], + "indent": ["off", 2], "no-console": 0, "space-before-function-paren": 0 } diff --git a/ant-design-vue-jeecg/src/main.js b/ant-design-vue-jeecg/src/main.js index 11ee55ba..8271b441 100644 --- a/ant-design-vue-jeecg/src/main.js +++ b/ant-design-vue-jeecg/src/main.js @@ -12,11 +12,14 @@ import ElementUI from 'element-ui'; import 'element-ui/lib/theme-chalk/index.css'; // YU-优化 -require('@jeecg/antd-online-mini') -require('@jeecg/antd-online-mini/dist/OnlineForm.css') - + require('@jeecg/antd-online-mini') + require('@jeecg/antd-online-mini/dist/OnlineForm.css') +// 引入 按需组件的统一引入文件 +//import './components/use' import Antd, { version } from 'ant-design-vue' -console.log('ant-design-vue version:', version) +// 按需引入所需组件,统一引入文件---优化 +//import './components/lazy_antd' +//console.log('ant-design-vue version:', version) import Viser from 'viser-vue' import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less' @@ -24,7 +27,7 @@ import 'ant-design-vue/dist/antd.less'; // or 'ant-design-vue/dist/antd.less' import '@/permission' // permission control import '@/utils/filter' // base filter // YU-优化 -//import Print from 'vue-print-nb-jeecg' +import Print from 'vue-print-nb-jeecg' import preview from 'vue-photo-preview' import 'vue-photo-preview/dist/skin.css' import SSO from '@/cas/sso.js' @@ -68,13 +71,15 @@ Vue.prototype.$axios=axios; Vue.prototype.rules = rules Vue.config.productionTip = false Vue.use(Storage, config.storageOptions) +// 按需引入所需组件,统一引入文件---优化 Vue.use(Antd) + Vue.use(ElementUI); Vue.use(VueAxios, router) Vue.use(Viser) Vue.use(hasPermission) Vue.use(JDictSelectTag) -//Vue.use(Print) +Vue.use(Print) Vue.use(preview) Vue.use(vueBus); Vue.use(JeecgComponents);