diff --git a/web/package.json b/web/package.json index ac60e3f..73981a4 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "django-vue3-admin", - "version": "3.1.0", + "version": "3.2.0", "description": "是一套全部开源的快速开发平台,毫无保留给个人免费使用、团体授权使用。\n django-vue3-admin 基于RBAC模型的权限控制的一整套基础开发平台,权限粒度达到列级别,前后端分离,后端采用django + django-rest-framework,前端采用基于 vue3 + CompositionAPI + typescript + vite + element plus", "license": "MIT", "scripts": { @@ -37,6 +37,7 @@ "js-cookie": "^3.0.5", "js-table2excel": "^1.1.2", "jsplumb": "^2.15.6", + "less": "^4.3.0", "lodash-es": "^4.17.21", "lunar-javascript": "^1.7.1", "mitt": "^3.0.1", @@ -53,9 +54,12 @@ "tailwindcss": "^3.2.7", "ts-md5": "^1.3.1", "upgrade": "^1.1.0", + "vant": "^4.9.19", + "vant4-kit": "^1.0.3", "vue": "^3.4.38", "vue-clipboard3": "^2.0.0", "vue-cropper": "^1.0.8", + "vue-draggable-plus": "^0.6.0", "vue-grid-layout": "^3.0.0-beta1", "vue-i18n": "^9.14.0", "vue-router": "^4.4.3", diff --git a/web/src/assets/iconfont/iconfont-01/iconfont.css b/web/src/assets/iconfont/iconfont-01/iconfont.css new file mode 100644 index 0000000..6ac83a6 --- /dev/null +++ b/web/src/assets/iconfont/iconfont-01/iconfont.css @@ -0,0 +1,55 @@ +@font-face { + font-family: "iconfont"; /* Project id 3882322 */ + src: url('iconfont.woff2?t=1676037377315') format('woff2'), + url('iconfont.woff?t=1676037377315') format('woff'), + url('iconfont.ttf?t=1676037377315') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-xiaoxizhongxin:before { + content: "\e665"; +} + +.icon-xitongshezhi:before { + content: "\e7ba"; +} + +.icon-caozuorizhi:before { + content: "\e611"; +} + +.icon-guanlidenglurizhi:before { + content: "\ea45"; +} + +.icon-rizhi:before { + content: "\e60c"; +} + +.icon-system:before { + content: "\e684"; +} + +.icon-Area:before { + content: "\eaa2"; +} + +.icon-file:before { + content: "\e671"; +} + +.icon-dict:before { + content: "\e626"; +} + +.icon-configure:before { + content: "\e733"; +} + diff --git a/web/src/assets/iconfont/iconfont-01/iconfont.ttf b/web/src/assets/iconfont/iconfont-01/iconfont.ttf new file mode 100644 index 0000000..1220a01 Binary files /dev/null and b/web/src/assets/iconfont/iconfont-01/iconfont.ttf differ diff --git a/web/src/assets/iconfont/iconfont-01/iconfont.woff b/web/src/assets/iconfont/iconfont-01/iconfont.woff new file mode 100644 index 0000000..4ce6f7c Binary files /dev/null and b/web/src/assets/iconfont/iconfont-01/iconfont.woff differ diff --git a/web/src/assets/iconfont/iconfont-01/iconfont.woff2 b/web/src/assets/iconfont/iconfont-01/iconfont.woff2 new file mode 100644 index 0000000..c7a73e7 Binary files /dev/null and b/web/src/assets/iconfont/iconfont-01/iconfont.woff2 differ diff --git a/web/src/assets/iconfont/iconfont-02/iconfont.css b/web/src/assets/iconfont/iconfont-02/iconfont.css new file mode 100644 index 0000000..a7393cc --- /dev/null +++ b/web/src/assets/iconfont/iconfont-02/iconfont.css @@ -0,0 +1,427 @@ +@font-face { + font-family: "iconfont"; /* Project id 2298093 */ + src: url('iconfont.woff2?t=1627014681704') format('woff2'), + url('iconfont.woff?t=1627014681704') format('woff'), + url('iconfont.ttf?t=1627014681704') format('truetype'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-diannao101:before { + content: "\e670"; +} + +.icon-diannao:before { + content: "\e618"; +} + +.icon-diannao1:before { + content: "\e622"; +} + +.icon-diannao-shuju:before { + content: "\e63e"; +} + +.icon-shoujidiannao:before { + content: "\e62e"; +} + +.icon-diannaobangong:before { + content: "\e647"; +} + +.icon-LoggedinPC:before { + content: "\e604"; +} + +.icon-barcode-qr:before { + content: "\e61e"; +} + +.icon-zhongduancanshuchaxun:before { + content: "\e638"; +} + +.icon-shouye_dongtaihui:before { + content: "\e606"; +} + +.icon-putong:before { + content: "\e603"; +} + +.icon-dongtai:before { + content: "\e659"; +} + +.icon-wenducanshu-05:before { + content: "\e634"; +} + +.icon-zhongduancanshu:before { + content: "\e63b"; +} + +.icon-tongzhi1:before { + content: "\e63a"; +} + +.icon-tongzhi2:before { + content: "\e649"; +} + +.icon-tongzhi3:before { + content: "\e648"; +} + +.icon-tongzhi4:before { + content: "\e60c"; +} + +.icon-dianhua:before { + content: "\e615"; +} + +.icon-xianshimima:before { + content: "\e63c"; +} + +.icon-yincangmima:before { + content: "\e63d"; +} + +.icon-shuxing:before { + content: "\e67a"; +} + +.icon-juxingkaobei:before { + content: "\e7a5"; +} + +.icon-shuxingtu:before { + content: "\e685"; +} + +.icon-bolangneng:before { + content: "\e745"; +} + +.icon-bolangnengshiyanchang:before { + content: "\e746"; +} + +.icon--chaifenhang:before { + content: "\e6d1"; +} + +.icon--chaifenlie:before { + content: "\e6d0"; +} + +.icon-tupianyulan:before { + content: "\e67e"; +} + +.icon-15tupianyulan:before { + content: "\e624"; +} + +.icon-728bianjiqi_zitidaxiao:before { + content: "\e660"; +} + +.icon-ziti:before { + content: "\e7b1"; +} + +.icon-font-size:before { + content: "\eaef"; +} + +.icon-tuodong:before { + content: "\e6a8"; +} + +.icon-zhongyingwen1:before { + content: "\e7a3"; +} + +.icon-fuhao-yingwen:before { + content: "\e714"; +} + +.icon-fuhao-zhongwen:before { + content: "\e712"; +} + +.icon-diqiu:before { + content: "\e689"; +} + +.icon-xingqiu:before { + content: "\e65c"; +} + +.icon-diqiu1:before { + content: "\e631"; +} + +.icon-huanjingxingqiu:before { + content: "\e617"; +} + +.icon-zidingyibuju:before { + content: "\e637"; +} + +.icon-dayin:before { + content: "\e612"; +} + +.icon-step:before { + content: "\e601"; +} + +.icon-30xuanzhongyuanxingfill:before { + content: "\e677"; +} + +.icon-shibai:before { + content: "\e60b"; +} + +.icon-7_round_solid:before { + content: "\e64d"; +} + +.icon-6_round_solid:before { + content: "\e64e"; +} + +.icon-9_round_solid:before { + content: "\e64f"; +} + +.icon-1_round_solid:before { + content: "\e650"; +} + +.icon-5_round_solid:before { + content: "\e651"; +} + +.icon-2_round_solid:before { + content: "\e654"; +} + +.icon-0_round_solid:before { + content: "\e655"; +} + +.icon-3_round_solid:before { + content: "\e656"; +} + +.icon-4_round_solid:before { + content: "\e657"; +} + +.icon-8_round_solid:before { + content: "\e658"; +} + +.icon-radio-off-full:before { + content: "\ea6b"; +} + +.icon-tongzhi:before { + content: "\e600"; +} + +.icon-ditu:before { + content: "\e8bc"; +} + +.icon-ico:before { + content: "\e646"; +} + +.icon-chazhaobiaodanliebiao:before { + content: "\e76a"; +} + +.icon-biaodan:before { + content: "\e61d"; +} + +.icon-siweidaotu:before { + content: "\e614"; +} + +.icon-jiliandongxuanzeqi:before { + content: "\e616"; +} + +.icon-caijian:before { + content: "\e611"; +} + +.icon-fuwenben:before { + content: "\e7e4"; +} + +.icon-fuwenbenkuang:before { + content: "\e66f"; +} + +.icon-shangchuan:before { + content: "\e663"; +} + +.icon-xuanzeqi:before { + content: "\e635"; +} + +.icon-fangkuang:before { + content: "\e642"; +} + +.icon-gouxuan-weixuanzhong-xianxingfangkuang:before { + content: "\e77b"; +} + +.icon-shidu:before { + content: "\e60a"; +} + +.icon-yangan:before { + content: "\e67d"; +} + +.icon-wendu:before { + content: "\e686"; +} + +.icon-zaosheng:before { + content: "\e61c"; +} + +.icon-jinridaiban:before { + content: "\e60f"; +} + +.icon-AIshiyanshi:before { + content: "\e609"; +} + +.icon-shenqingkaiban:before { + content: "\e639"; +} + +.icon-zhongyingwenqiehuan:before { + content: "\e611"; +} + +.icon-zhongyingwen:before { + content: "\e605"; +} + +.icon-zhongyingzhuanhuan:before { + content: "\e6a2"; +} + +.icon-zhongyingwenyuyan:before { + content: "\e609"; +} + +.icon-shuju:before { + content: "\e613"; +} + +.icon-ico_shuju:before { + content: "\e6ff"; +} + +.icon-shuju1:before { + content: "\e60e"; +} + +.icon-fuzhiyemian:before { + content: "\e772"; +} + +.icon-caozuo-wailian:before { + content: "\e711"; +} + +.icon-icon-:before { + content: "\e620"; +} + +.icon-gerenzhongxin:before { + content: "\e60d"; +} + +.icon-caidan:before { + content: "\e652"; +} + +.icon-xitongshezhi:before { + content: "\e69b"; +} + +.icon-neiqianshujuchucun:before { + content: "\e62f"; +} + +.icon-shouye:before { + content: "\e653"; +} + +.icon-quanxian:before { + content: "\e610"; +} + +.icon-zujian:before { + content: "\e85e"; +} + +.icon-crew_feature:before { + content: "\e602"; +} + +.icon-gongju:before { + content: "\e62d"; +} + +.icon-skin:before { + content: "\e636"; +} + +.icon-shixinyuan:before { + content: "\e669"; +} + +.icon-webicon318:before { + content: "\e6a9"; +} + +.icon-dian:before { + content: "\e608"; +} + +.icon-fullscreen:before { + content: "\e623"; +} + +.icon-tuichuquanping:before { + content: "\e641"; +} + diff --git a/web/src/assets/iconfont/iconfont-02/iconfont.ttf b/web/src/assets/iconfont/iconfont-02/iconfont.ttf new file mode 100644 index 0000000..2d3a61d Binary files /dev/null and b/web/src/assets/iconfont/iconfont-02/iconfont.ttf differ diff --git a/web/src/assets/iconfont/iconfont-02/iconfont.woff b/web/src/assets/iconfont/iconfont-02/iconfont.woff new file mode 100644 index 0000000..c3575c3 Binary files /dev/null and b/web/src/assets/iconfont/iconfont-02/iconfont.woff differ diff --git a/web/src/assets/iconfont/iconfont-02/iconfont.woff2 b/web/src/assets/iconfont/iconfont-02/iconfont.woff2 new file mode 100644 index 0000000..9eaf90e Binary files /dev/null and b/web/src/assets/iconfont/iconfont-02/iconfont.woff2 differ diff --git a/web/src/main.ts b/web/src/main.ts index 54459c3..0ec8a6b 100644 --- a/web/src/main.ts +++ b/web/src/main.ts @@ -25,6 +25,8 @@ import fontAwesome470 from 'e-icon-picker/icon/fontawesome/font-awesome.v4.7.0.j import eIconList from 'e-icon-picker/icon/default-icon/eIconList.js'; import iconfont from '/@/assets/iconfont/iconfont.json'; //引入json文件 import '/@/assets/iconfont/iconfont.css'; //引入css +import '/@/assets/iconfont/iconfont-01/iconfont.css'; //引入css +import '/@/assets/iconfont/iconfont-02/iconfont.css'; //引入css // 自动注册插件 import { scanAndInstallPlugins } from '/@/views/plugins/index'; import VXETable from 'vxe-table' diff --git a/web/src/utils/setIconfont.ts b/web/src/utils/setIconfont.ts index b1a4d58..1d04c4e 100644 --- a/web/src/utils/setIconfont.ts +++ b/web/src/utils/setIconfont.ts @@ -1,7 +1,7 @@ // 字体图标 url const cssCdnUrlList: Array = [ - '//at.alicdn.com/t/font_2298093_y6u00apwst.css', - '//at.alicdn.com/t/c/font_3882322_9ah7y8m9175.css', //dvadmin3项目用icon + // '//at.alicdn.com/t/font_2298093_y6u00apwst.css', + // '//at.alicdn.com/t/c/font_3882322_9ah7y8m9175.css', //dvadmin3项目用icon //'//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css' ]; // 第三方 js url