diff --git a/package.json b/package.json index 5064d6c..640ea69 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@types/axios": "^0.14.0", "@types/clipboard": "^2.0.1", - "@types/node": "^15.0.0", + "@types/node": "^15.0.1", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.6", "@typescript-eslint/eslint-plugin": "^4.22.0", @@ -43,7 +43,7 @@ "eslint": "^7.25.0", "eslint-plugin-vue": "^7.9.0", "prettier": "^2.2.1", - "sass": "^1.32.11", + "sass": "^1.32.12", "sass-loader": "^11.0.1", "typescript": "^4.2.4", "vite": "^2.2.3", diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index d3ec679..af5bf30 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -45,6 +45,7 @@ export default { pagesListAdapt: 'ListAdapt', pagesWaterfall: 'Waterfall', pagesSteps: 'Steps', + pagesPreview: 'Large preview', chartIndex: 'chartIndex', personal: 'personal', tools: 'tools', diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts index ff7e633..8ceceea 100644 --- a/src/i18n/lang/zh-cn.ts +++ b/src/i18n/lang/zh-cn.ts @@ -45,6 +45,7 @@ export default { pagesListAdapt: '列表自适应', pagesWaterfall: '瀑布屏', pagesSteps: '步骤条', + pagesPreview: '大图预览', chartIndex: '大数据图表', personal: '个人中心', tools: '工具类集合', diff --git a/src/i18n/lang/zh-tw.ts b/src/i18n/lang/zh-tw.ts index b529e39..16ef697 100644 --- a/src/i18n/lang/zh-tw.ts +++ b/src/i18n/lang/zh-tw.ts @@ -45,6 +45,7 @@ export default { pagesListAdapt: '清單自我調整', pagesWaterfall: '瀑布屏', pagesSteps: '步驟條', + pagesPreview: '大圖預覽', chartIndex: '大資料圖表', personal: '個人中心', tools: '工具類集合', diff --git a/src/router/index.ts b/src/router/index.ts index 03ef77d..4869a19 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -697,6 +697,21 @@ export const dynamicRoutes = [ icon: 'iconfont icon-step', }, }, + { + path: '/pages/preview', + name: 'pagesPreview', + component: () => import('/@/views/pages/preview/index.vue'), + meta: { + title: 'message.router.pagesPreview', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + auth: ['admin', 'test'], + icon: 'iconfont icon-15tupianyulan', + }, + }, ], }, { diff --git a/src/theme/element.scss b/src/theme/element.scss index 14f68b6..83917e7 100644 --- a/src/theme/element.scss +++ b/src/theme/element.scss @@ -583,6 +583,25 @@ background-color: set-color(info); } +/* Result 结果 +------------------------------- */ +// success +.el-result .icon-success { + fill: set-color(success); +} +// warning +.el-result .icon-warning { + fill: set-color(warning); +} +// error +.el-result .icon-error { + fill: set-color(danger); +} +// info +.el-result .icon-info { + fill: set-color(info); +} + /* Alert 警告 ------------------------------- */ // success diff --git a/src/utils/setIconfont.ts b/src/utils/setIconfont.ts index 43ae3af..5832850 100644 --- a/src/utils/setIconfont.ts +++ b/src/utils/setIconfont.ts @@ -1,6 +1,6 @@ // 字体图标 url const cssCdnUrlList: Array = [ - '//at.alicdn.com/t/font_2298093_vcabyobusxq.css', + '//at.alicdn.com/t/font_2298093_omfjza0tsa.css', '//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', ]; // 第三方 js url diff --git a/src/views/layout/navBars/breadcrumb/setings.vue b/src/views/layout/navBars/breadcrumb/setings.vue index 6b9c601..bac1434 100644 --- a/src/views/layout/navBars/breadcrumb/setings.vue +++ b/src/views/layout/navBars/breadcrumb/setings.vue @@ -654,7 +654,7 @@ export default defineComponent({ onWartermarkChange(); // 语言国际化 if (getLocal('themeConfig')) proxy.$i18n.locale = getLocal('themeConfig').globalI18n; - }, 1000); + }, 1100); }); }); }); diff --git a/src/views/pages/awesome/index.vue b/src/views/pages/awesome/index.vue index 2ee35e9..e408ae0 100644 --- a/src/views/pages/awesome/index.vue +++ b/src/views/pages/awesome/index.vue @@ -56,7 +56,11 @@ export default { height: 120px; overflow: hidden; display: flex; + transition: all 0.3s ease; &:hover { + box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); + cursor: pointer; + transition: all 0.3s ease; .iconfont-warp-value { i { color: var(--color-primary); diff --git a/src/views/pages/element/index.vue b/src/views/pages/element/index.vue index dff77af..f07e8b4 100644 --- a/src/views/pages/element/index.vue +++ b/src/views/pages/element/index.vue @@ -57,7 +57,11 @@ export default { height: 120px; overflow: hidden; display: flex; + transition: all 0.3s ease; &:hover { + box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); + cursor: pointer; + transition: all 0.3s ease; .iconfont-warp-value { i { color: var(--color-primary); diff --git a/src/views/pages/formAdapt/index.vue b/src/views/pages/formAdapt/index.vue index f785b14..d23125f 100644 --- a/src/views/pages/formAdapt/index.vue +++ b/src/views/pages/formAdapt/index.vue @@ -72,7 +72,7 @@ - 更新个人信息 + 更新个人信息 diff --git a/src/views/pages/iocnfont/index.vue b/src/views/pages/iocnfont/index.vue index 4c66dbe..d18b91c 100644 --- a/src/views/pages/iocnfont/index.vue +++ b/src/views/pages/iocnfont/index.vue @@ -53,7 +53,11 @@ export default { height: 120px; overflow: hidden; display: flex; + transition: all 0.3s ease; &:hover { + box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); + cursor: pointer; + transition: all 0.3s ease; .iconfont-warp-value { i { color: var(--color-primary); diff --git a/src/views/pages/preview/index.vue b/src/views/pages/preview/index.vue new file mode 100644 index 0000000..7e8ceb7 --- /dev/null +++ b/src/views/pages/preview/index.vue @@ -0,0 +1,27 @@ + + + diff --git a/src/views/pages/steps/index.vue b/src/views/pages/steps/index.vue index c01f58b..a229b1e 100644 --- a/src/views/pages/steps/index.vue +++ b/src/views/pages/steps/index.vue @@ -6,7 +6,10 @@ - 下一步 + + + + 下一步