+
+
+ );
+ }
+});
diff --git a/src/components/RePureTableBar/src/svg/collapse.svg b/src/components/RePureTableBar/src/svg/collapse.svg
new file mode 100644
index 0000000..d84f870
--- /dev/null
+++ b/src/components/RePureTableBar/src/svg/collapse.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/RePureTableBar/src/svg/drag.svg b/src/components/RePureTableBar/src/svg/drag.svg
new file mode 100644
index 0000000..8c37370
--- /dev/null
+++ b/src/components/RePureTableBar/src/svg/drag.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/RePureTableBar/src/svg/expand.svg b/src/components/RePureTableBar/src/svg/expand.svg
new file mode 100644
index 0000000..dbbd4ed
--- /dev/null
+++ b/src/components/RePureTableBar/src/svg/expand.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/RePureTableBar/src/svg/refresh.svg b/src/components/RePureTableBar/src/svg/refresh.svg
new file mode 100644
index 0000000..140288c
--- /dev/null
+++ b/src/components/RePureTableBar/src/svg/refresh.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/components/RePureTableBar/src/svg/settings.svg b/src/components/RePureTableBar/src/svg/settings.svg
new file mode 100644
index 0000000..be23a0b
--- /dev/null
+++ b/src/components/RePureTableBar/src/svg/settings.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/config/index.ts b/src/config/index.ts
index 9b0a372..4cd3016 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -49,4 +49,7 @@ export const getServerConfig = async (app: App): Promise
+
+ {slots.default({
+ size: size.value,
+ dynamicColumns: dynamicColumns.value
+ })}
+ {props.title}
+
+ {slots?.buttons ? (
+
+ onExpand()}
+ />
+
+
+ onReFresh()}
+ />
+
+
+
+
+
+
+
+
+
+ {slots.buttons()}
+ ) : null}
+ {props.tableRef?.size ? (
+ <>
+
+ handleCheckAllChange(value)}
+ />
+ onReset()}>
+ 重置
+
+
+
+
+ handleCheckedColumnsChange(value)}
+ >
+
+ {checkColumnList.map(item => {
+ return (
+
+
+
+
+ void;
+ }) => rowDrop(event)}
+ />
+
+ handleCheckColumnListChange(value, item)
+ }
+ >
+
+ {item}
+
+
+
+ );
+ })}
+
+
{{ title }}
@@ -104,9 +104,9 @@ watch(
max-width: 120px;
::v-deep(.el-dropdown-menu__item) {
- min-width: 100%;
display: inline-flex;
flex-wrap: wrap;
+ min-width: 100%;
}
}
diff --git a/src/layout/components/sidebar/logo.vue b/src/layout/components/sidebar/logo.vue
index f079b3b..78a55be 100644
--- a/src/layout/components/sidebar/logo.vue
+++ b/src/layout/components/sidebar/logo.vue
@@ -1,4 +1,5 @@
@@ -16,7 +18,7 @@ const { title } = useNav();
key="props.collapse"
:title="title"
class="sidebar-logo-link"
- to="/"
+ :to="topPath"
>
@@ -26,7 +28,7 @@ const { title } = useNav();
key="expand"
:title="title"
class="sidebar-logo-link"
- to="/"
+ :to="topPath"
>
@@ -37,33 +39,33 @@ const { title } = useNav();
diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/sidebar/sidebarItem.vue
index 7ac1950..79d7f0e 100644
--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/sidebar/sidebarItem.vue
@@ -1,8 +1,8 @@
@@ -46,7 +49,7 @@ defineOptions({
+import { useRouter } from "vue-router";
import noExist from "@/assets/status/404.svg?component";
defineOptions({
name: "404"
});
+
+const router = useRouter();
@@ -46,7 +49,7 @@ defineOptions({
+import { useRouter } from "vue-router";
import noServer from "@/assets/status/500.svg?component";
defineOptions({
name: "500"
});
+
+const router = useRouter();
@@ -46,7 +49,7 @@ defineOptions({
{
if (res.success) {
// 获取后端路由
initRouter().then(() => {
- router.push("/");
+ router.push(getTopMenu(true).path);
message("登录成功", { type: "success" });
});
}
diff --git a/stylelint.config.js b/stylelint.config.js
index 67f8c07..2a4d3ba 100644
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -1,20 +1,39 @@
module.exports = {
root: true,
- plugins: ["stylelint-order"],
- customSyntax: "postcss-html",
- extends: ["stylelint-config-standard", "stylelint-config-prettier"],
+ extends: [
+ "stylelint-config-standard",
+ "stylelint-config-html/vue",
+ "stylelint-config-recess-order"
+ ],
+ plugins: ["stylelint-order", "stylelint-prettier", "stylelint-scss"],
+ overrides: [
+ {
+ files: ["**/*.(css|html|vue)"],
+ customSyntax: "postcss-html"
+ },
+ {
+ files: ["*.scss", "**/*.scss"],
+ customSyntax: "postcss-scss",
+ extends: [
+ "stylelint-config-standard-scss",
+ "stylelint-config-recommended-vue/scss"
+ ]
+ }
+ ],
rules: {
"selector-class-pattern": null,
+ "no-descending-specificity": null,
+ "scss/dollar-variable-pattern": null,
"selector-pseudo-class-no-unknown": [
true,
{
- ignorePseudoClasses: ["global"]
+ ignorePseudoClasses: ["deep", "global"]
}
],
"selector-pseudo-element-no-unknown": [
true,
{
- ignorePseudoElements: ["v-deep"]
+ ignorePseudoElements: ["v-deep", "v-global", "v-slotted"]
}
],
"at-rule-no-unknown": [
@@ -30,17 +49,11 @@ module.exports = {
"if",
"each",
"include",
- "mixin"
+ "mixin",
+ "use"
]
}
],
- "no-empty-source": null,
- "named-grid-areas-no-invalid": null,
- "unicode-bom": "never",
- "no-descending-specificity": null,
- "font-family-no-missing-generic-family-keyword": null,
- "declaration-colon-space-after": "always-single-line",
- "declaration-colon-space-before": "never",
"rule-empty-line-before": [
"always",
{
@@ -67,26 +80,5 @@ module.exports = {
{ severity: "warning" }
]
},
- ignoreFiles: ["**/*.js", "**/*.jsx", "**/*.tsx", "**/*.ts", "**/*.json"],
- overrides: [
- {
- files: ["*.vue", "**/*.vue", "*.html", "**/*.html"],
- extends: ["stylelint-config-recommended", "stylelint-config-html"],
- rules: {
- "keyframes-name-pattern": null,
- "selector-pseudo-class-no-unknown": [
- true,
- {
- ignorePseudoClasses: ["deep", "global"]
- }
- ],
- "selector-pseudo-element-no-unknown": [
- true,
- {
- ignorePseudoElements: ["v-deep", "v-global", "v-slotted"]
- }
- ]
- }
- }
- ]
+ ignoreFiles: ["**/*.js", "**/*.ts", "**/*.jsx", "**/*.tsx"]
};
diff --git a/tailwind.config.js b/tailwind.config.js
index 11bb37f..41e05b6 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -10,10 +10,8 @@ module.exports = {
colors: {
bg_color: "var(--el-bg-color)",
primary: "var(--el-color-primary)",
- primary_light_9: "var(--el-color-primary-light-9)",
text_color_primary: "var(--el-text-color-primary)",
- text_color_regular: "var(--el-text-color-regular)",
- text_color_disabled: "var(--el-text-color-disabled)"
+ text_color_regular: "var(--el-text-color-regular)"
}
}
}
diff --git a/tsconfig.json b/tsconfig.json
index 7680e41..623c869 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,6 @@
"allowJs": false,
"resolveJsonModule": true,
"lib": ["dom", "esnext"],
- "incremental": true,
"paths": {
"@/*": ["src/*"],
"@build/*": ["build/*"]
@@ -28,10 +27,9 @@
"vite/client",
"element-plus/global",
"@pureadmin/table/volar",
- "@pureadmin/descriptions/volar",
- "unplugin-vue-define-options/macros-global"
+ "@pureadmin/descriptions/volar"
],
- "typeRoots": ["./node_modules/@types/", "./types"]
+ "typeRoots": ["./types", "./node_modules/@types/"]
},
"include": [
"mock/*.ts",
@@ -41,5 +39,5 @@
"types/*.d.ts",
"vite.config.ts"
],
- "exclude": ["node_modules", "dist", "**/*.js"]
+ "exclude": ["dist", "**/*.js", "node_modules"]
}
diff --git a/types/global-components.d.ts b/types/global-components.d.ts
index 35d2df0..bc85618 100644
--- a/types/global-components.d.ts
+++ b/types/global-components.d.ts
@@ -11,7 +11,7 @@ declare module "vue" {
}
/**
- * todo：https://github.com/element-plus/element-plus/blob/dev/global.d.ts#L2
+ * TODO https://github.com/element-plus/element-plus/blob/dev/global.d.ts#L2
* No need to install @vue/runtime-core
*/
declare module "vue" {
diff --git a/types/global.d.ts b/types/global.d.ts
index 665b3dd..ae7bc4a 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -63,6 +63,7 @@ declare global {
VITE_PUBLIC_PATH: string;
VITE_ROUTER_HISTORY: string;
VITE_CDN: boolean;
+ VITE_HIDE_HOME: string;
VITE_COMPRESSION: ViteCompression;
}
@@ -96,6 +97,7 @@ declare global {
MenuArrowIconNoTransition?: boolean;
CachingAsyncRoutes?: boolean;
TooltipEffect?: Effect;
+ ResponsiveStorageNameSpace?: string;
}
/**
{{ title }}
@@ -26,7 +28,7 @@ const { title } = useNav();
key="expand"
:title="title"
class="sidebar-logo-link"
- to="/"
+ :to="topPath"
>
@@ -37,33 +39,33 @@ const { title } = useNav();
diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/sidebar/sidebarItem.vue
index 7ac1950..79d7f0e 100644
--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/sidebar/sidebarItem.vue
@@ -1,8 +1,8 @@
@@ -46,7 +49,7 @@ defineOptions({