hjq/mart-admin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'admin-21.07.07:更新最新依赖'

Browse Source
This commit is contained in:
lyt 2021-07-07 17:15:11 +08:00
parent 8ff747f011
commit ae27489247
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -41,7 +41,7 @@
#### ⚡ 使用说明 #### ⚡ 使用说明
建议使用 cnpm，因为 yarn 有时会报错。 建议使用 cnpm，因为 yarn 有时会报错。<a href="http://nodejs.cn/" target="_blank">node 版本 > 12xx.xx.x</a>
```bash ```bash
# 克隆项目 # 克隆项目

20
package.json
View File

@ -19,7 +19,7 @@
"print-js": "^1.6.0", "print-js": "^1.6.0",
"qrcodejs2-fixes": "^0.0.2", "qrcodejs2-fixes": "^0.0.2",
"screenfull": "^5.1.0", "screenfull": "^5.1.0",
"sortablejs": "^1.13.0", "sortablejs": "^1.14.0",
"splitpanes": "^3.0.4", "splitpanes": "^3.0.4",
"vue": "^3.0.11", "vue": "^3.0.11",
"vue-grid-layout": "^3.0.0-beta1", "vue-grid-layout": "^3.0.0-beta1",
@ -32,22 +32,22 @@
"devDependencies": { "devDependencies": {
"@types/axios": "^0.14.0", "@types/axios": "^0.14.0",
"@types/clipboard": "^2.0.1", "@types/clipboard": "^2.0.1",
"@types/node": "^15.14.0", "@types/node": "^16.0.0",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.10.6", "@types/sortablejs": "^1.10.7",
"@typescript-eslint/eslint-plugin": "^4.28.1", "@typescript-eslint/eslint-plugin": "^4.28.2",
"@typescript-eslint/parser": "^4.28.1", "@typescript-eslint/parser": "^4.28.2",
"@vitejs/plugin-vue": "^1.2.4", "@vitejs/plugin-vue": "^1.2.4",
"@vue/compiler-sfc": "^3.1.3", "@vue/compiler-sfc": "^3.1.4",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"eslint": "^7.29.0", "eslint": "^7.30.0",
"eslint-plugin-vue": "^7.12.1", "eslint-plugin-vue": "^7.13.0",
"prettier": "^2.3.2", "prettier": "^2.3.2",
"sass": "^1.35.1", "sass": "^1.35.1",
"sass-loader": "^12.1.0", "sass-loader": "^12.1.0",
"typescript": "^4.3.5", "typescript": "^4.3.5",
"vite": "^2.3.8", "vite": "^2.4.1",
"vue-eslint-parser": "^7.7.1" "vue-eslint-parser": "^7.8.0"
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",

3
src/layout/component/main.vue
View File

@ -3,7 +3,7 @@
<el-scrollbar <el-scrollbar
class="layout-scrollbar" class="layout-scrollbar"
ref="layoutScrollbarRef" ref="layoutScrollbarRef"
v-show="!currentRouteMeta.isLink && !currentRouteMeta.isIframe" v-if="!currentRouteMeta.isLink && !currentRouteMeta.isIframe"
:style="{ minHeight: `calc(100vh - ${headerHeight}` }" :style="{ minHeight: `calc(100vh - ${headerHeight}` }"
> >
<LayoutParentView /> <LayoutParentView />
@ -79,7 +79,6 @@ export default defineComponent({
() => route.path, () => route.path,
() => { () => {
initCurrentRouteMeta(route.meta); initCurrentRouteMeta(route.meta);
proxy.$refs.layoutScrollbarRef.wrap.scrollTop = 0;
} }
); );
return { return {

2
src/views/tools/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<el-card shadow="hover" header="正则验证（一些项目中常用的正则）"> <el-card shadow="hover" header="正则验证（一些项目中常用的正则）">
<el-form :model="ruleForm" :rules="rules" class="tools-warp-form" size="small"> <el-form :model="ruleForm" :rules="rules" class="tools-warp-form" size="small" label-position="top">
<el-form-item label="小数或整数:" prop="a1"> <el-form-item label="小数或整数:" prop="a1">
<div class="tools-warp-form-msg"> <div class="tools-warp-form-msg">
验证可以输入小数或整数，0 开始， . 只能出现一次，保留小数点后保留2位小数。(负数时，模拟拼接负号给后台)。 验证可以输入小数或整数，0 开始， . 只能出现一次，保留小数点后保留2位小数。(负数时，模拟拼接负号给后台)。