Merge branch 'main' of github.com:pure-admin/vue-pure-admin into gitee

This commit is contained in:
xiaoxian521 2023-11-02 10:06:18 +08:00
commit c57b2be2b0
5 changed files with 449 additions and 356 deletions

View File

@ -15,7 +15,7 @@ export default [
roles: ["admin"],
accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
expires: "2023/10/30 00:00:00"
expires: "2030/10/30 00:00:00"
}
};
} else {
@ -27,7 +27,7 @@ export default [
roles: ["common"],
accessToken: "eyJhbGciOiJIUzUxMiJ9.common",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh",
expires: "2023/10/30 00:00:00"
expires: "2030/10/30 00:00:00"
}
};
}

View File

@ -13,7 +13,7 @@ export default [
accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh",
// `expires`选择这种日期格式是为了方便调试,后端直接设置时间戳或许更方便(每次都应该递增)。如果后端返回的是时间戳格式,前端开发请来到这个目录`src/utils/auth.ts`,把第`38`行的代码换成expires = data.expires即可。
expires: "2023/10/30 23:59:59"
expires: "2030/10/30 23:59:59"
}
};
} else {

View File

@ -46,25 +46,25 @@
},
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1",
"@howdyjs/mouse-menu": "^2.0.9",
"@logicflow/core": "^1.2.15",
"@logicflow/extension": "^1.2.16",
"@pureadmin/descriptions": "^1.1.1",
"@pureadmin/table": "^2.3.3",
"@howdyjs/mouse-menu": "2.0.9",
"@logicflow/core": "^1.2.17",
"@logicflow/extension": "^1.2.18",
"@pureadmin/descriptions": "^1.2.0",
"@pureadmin/table": "^2.3.4",
"@pureadmin/utils": "^1.9.10",
"@vueuse/core": "^10.4.1",
"@vueuse/core": "^10.5.0",
"@vueuse/motion": "^2.0.0",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
"axios": "^1.5.1",
"axios": "^1.6.0",
"china-area-data": "^5.0.1",
"cropperjs": "^1.6.1",
"dayjs": "^1.11.10",
"echarts": "^5.4.3",
"el-table-infinite-scroll": "^3.0.3",
"element-plus": "^2.3.14",
"element-plus": "^2.4.1",
"intro.js": "^7.2.0",
"js-cookie": "^3.0.5",
"jsbarcode": "^3.11.5",
@ -75,19 +75,19 @@
"mockjs": "^1.1.0",
"nprogress": "^0.2.0",
"path": "^0.12.7",
"pinia": "^2.1.6",
"pinyin-pro": "^3.16.7",
"pinia": "^2.1.7",
"pinyin-pro": "^3.17.0",
"qrcode": "^1.5.3",
"qs": "^6.11.2",
"responsive-storage": "^2.2.0",
"sortablejs": "^1.15.0",
"swiper": "^11.0.0",
"swiper": "^11.0.3",
"typeit": "^8.7.1",
"v-contextmenu": "3.0.0",
"v3-infinite-loading": "^1.3.1",
"version-rocket": "^1.7.0",
"vue": "^3.3.4",
"vue-i18n": "^9.5.0",
"vue": "^3.3.7",
"vue-i18n": "^9.6.2",
"vue-json-pretty": "^2.2.4",
"vue-pdf-embed": "^1.2.1",
"vue-router": "^4.2.5",
@ -97,7 +97,7 @@
"vue-waterfall-plugin-next": "^2.2.4",
"vue3-danmaku": "^1.6.0",
"vuedraggable": "^4.1.0",
"wavesurfer.js": "^7.3.4",
"wavesurfer.js": "^7.4.2",
"xgplayer": "^3.0.9",
"xlsx": "^0.18.5"
},
@ -128,7 +128,7 @@
"cssnano": "^6.0.1",
"eslint": "^8.50.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-vue": "^9.17.0",
"eslint-plugin-vue": "^9.18.1",
"husky": "^8.0.3",
"lint-staged": "^14.0.1",
"picocolors": "^1.0.0",
@ -153,17 +153,17 @@
"stylelint-prettier": "^4.0.2",
"stylelint-scss": "^5.2.1",
"svgo": "^3.0.2",
"tailwindcss": "^3.3.3",
"terser": "^5.21.0",
"tailwindcss": "^3.3.5",
"terser": "^5.24.0",
"typescript": "^5.2.2",
"vite": "^4.4.11",
"vite": "^4.5.0",
"vite-plugin-cdn-import": "^0.3.5",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-mock": "2.9.6",
"vite-plugin-remove-console": "^2.1.1",
"vite-svg-loader": "^4.0.0",
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.8.15"
"vue-eslint-parser": "^9.3.2",
"vue-tsc": "^1.8.22"
},
"pnpm": {
"peerDependencyRules": {

675
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@ -262,7 +262,7 @@ export default defineComponent({
v-slots={reference}
placement="bottom-start"
popper-style={{ padding: 0 }}
width="160"
width="200"
trigger="click"
>
<div class={[topClass.value]}>
@ -279,6 +279,7 @@ export default defineComponent({
</div>
<div class="pt-[6px] pl-[11px]">
<el-scrollbar max-height="36vh">
<el-checkbox-group
v-model={checkedColumns.value}
onChange={value => handleCheckedColumnsChange(value)}
@ -321,6 +322,7 @@ export default defineComponent({
})}
</el-space>
</el-checkbox-group>
</el-scrollbar>
</div>
</el-popover>
</div>