+
@@ -56,6 +57,7 @@
import { useRouter } from 'vue-router';
import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
import { LAYOUT_ELEMENT_IDS } from '/@/layout/layout-const.js';
+ import MenuLocationBreadcrumb from './components/menu-location-breadcrumb/index.vue';
const windowHeight = ref(window.innerHeight);
//主题颜色
@@ -76,6 +78,10 @@
const footerFlag = computed(() => useAppConfigStore().$state.footerFlag);
// 是否显示水印
const watermarkFlag = computed(() => useAppConfigStore().$state.watermarkFlag);
+ // 标签页位置
+ const pageTagLocation = computed(() => useAppConfigStore().$state.pageTagLocation);
+ // 面包屑
+ const breadCrumbFlag = computed(() => useAppConfigStore().$state.breadCrumbFlag);
// 页面宽度
const pageWidth = computed(() => useAppConfigStore().$state.pageWidth);
// 多余高度
@@ -85,9 +91,16 @@
}
let due = '45px';
- if (useAppConfigStore().$state.pageTagFlag) {
+ if (useAppConfigStore().$state.pageTagFlag || useAppConfigStore().$state.breadCrumbFlag) {
due = '85px';
}
+ if (
+ useAppConfigStore().$state.pageTagFlag &&
+ useAppConfigStore().$state.pageTagLocation === 'center' &&
+ useAppConfigStore().$state.breadCrumbFlag
+ ) {
+ due = '125px';
+ }
return due;
});
diff --git a/smart-admin-web-typescript/src/lib/axios.ts b/smart-admin-web-typescript/src/lib/axios.ts
index 2ee2b2d1..84da1c40 100644
--- a/smart-admin-web-typescript/src/lib/axios.ts
+++ b/smart-admin-web-typescript/src/lib/axios.ts
@@ -17,7 +17,7 @@ import _ from 'lodash';
import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
// token的消息头
-const TOKEN_HEADER = 'x-access-token';
+const TOKEN_HEADER = 'Authorization';
// 创建axios对象
const smartAxios = axios.create({
@@ -37,7 +37,7 @@ smartAxios.interceptors.request.use(
// 在发送请求之前消息头加入token token
const token = localRead(LocalStorageKeyConst.USER_TOKEN);
if (token) {
- config.headers[TOKEN_HEADER] = token;
+ config.headers[TOKEN_HEADER] = 'Bearer ' + token;
} else {
delete config.headers[TOKEN_HEADER];
}
diff --git a/smart-admin-web-typescript/src/main.ts b/smart-admin-web-typescript/src/main.ts
index e9eeeb20..8b140479 100644
--- a/smart-admin-web-typescript/src/main.ts
+++ b/smart-admin-web-typescript/src/main.ts
@@ -30,6 +30,9 @@ import 'vue3-tabs-chrome/dist/vue3-tabs-chrome.css';
import '/@/theme/index.less';
import { localRead } from '/@/utils/local-util.js';
import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
+import { Table } from 'ant-design-vue';
+import { useAppConfigStore } from '/@/store/modules/system/app-config';
+import '/@/utils/ployfill';
/*
* -------------------- ※ 着重 解释说明下main.js的初始化逻辑 begin ※ --------------------
@@ -64,7 +67,7 @@ async function getLoginInfo() {
}
}
-function initVue() {
+async function initVue() {
let vueApp = createApp(App);
let app = vueApp.use(router).use(store).use(i18n).use(Antd).use(smartEnumPlugin, constantsInfo).use(privilegePlugin).use(JsonViewer);
//注入权限
@@ -83,11 +86,17 @@ function initVue() {
//挂载
app.mount('#app');
}
-
+function setTableYHeight() {
+ Table.props.scroll.default = {
+ y: useAppConfigStore().tableYHeight,
+ };
+}
//不需要获取用户信息、用户菜单、用户菜单动态路由，直接初始化vue即可
let token = localRead(LocalStorageKeyConst.USER_TOKEN);
if (!token) {
- initVue();
+ await initVue();
+ setTableYHeight();
} else {
- getLoginInfo();
+ await getLoginInfo();
+ setTableYHeight();
}
diff --git a/smart-admin-web-typescript/src/plugins/privilege-plugin.ts b/smart-admin-web-typescript/src/plugins/privilege-plugin.ts
index 0b99f6ca..27d09a2f 100644
--- a/smart-admin-web-typescript/src/plugins/privilege-plugin.ts
+++ b/smart-admin-web-typescript/src/plugins/privilege-plugin.ts
@@ -9,6 +9,7 @@
*/
import { useUserStore } from '/@/store/modules/system/user';
import { App } from 'vue';
+import _ from 'lodash';
const privilege = (value: string) => {
// 超级管理员
@@ -20,7 +21,7 @@ const privilege = (value: string) => {
if (!userPointsList) {
return false;
}
- return userPointsList && userPointsList.includes(value);
+ return _.some(userPointsList, ['apiPerms', value]);
};
export default {
diff --git a/smart-admin-web-typescript/src/store/modules/system/dict.ts b/smart-admin-web-typescript/src/store/modules/system/dict.ts
new file mode 100644
index 00000000..2e41c044
--- /dev/null
+++ b/smart-admin-web-typescript/src/store/modules/system/dict.ts
@@ -0,0 +1,53 @@
+import { defineStore } from 'pinia';
+
+export const useDictStore = defineStore({
+ id: 'dict',
+ state: () => ({
+ dict: new Array(),
+ }),
+ actions: {
+ // 获取字典
+ getDict(keyCode: any) {
+ if (keyCode == null && keyCode == '') {
+ return null;
+ }
+ try {
+ for (let i = 0; i < this.dict.length; i++) {
+ if (this.dict[i].keyCode == keyCode) {
+ return this.dict[i].value;
+ }
+ }
+ } catch (e) {
+ return null;
+ }
+ },
+ // 设置字典
+ setDict(keyCode: any, value: any) {
+ if (keyCode !== null && keyCode !== '') {
+ this.dict.push({
+ key: keyCode,
+ value: value,
+ });
+ }
+ },
+ // 删除字典
+ removeDict(keyCode: any) {
+ let flag = false;
+ try {
+ for (let i = 0; i < this.dict.length; i++) {
+ if (this.dict[i].keyCode == keyCode) {
+ this.dict.splice(i, 1);
+ return true;
+ }
+ }
+ } catch (e) {
+ flag = false;
+ }
+ return false;
+ },
+ // 清空字典
+ cleanDict() {
+ this.dict = new Array();
+ },
+ },
+});
diff --git a/smart-admin-web-typescript/src/types/config.d.ts b/smart-admin-web-typescript/src/types/config.d.ts
index 8ddce866..4f8c6e9c 100644
--- a/smart-admin-web-typescript/src/types/config.d.ts
+++ b/smart-admin-web-typescript/src/types/config.d.ts
@@ -22,7 +22,6 @@ export type LayoutType = 'side' | 'side-expand';
*/
export type ThemeType = 'light' | 'dark';
-
/**
* 应用信息配置
*/
@@ -33,6 +32,10 @@ export interface AppConfig {
layout: string;
// 主题
sideMenuTheme: ThemeType;
+ // 表格高度
+ tableYHeight: number;
+ //标签页位置
+ pageTagLocation: string;
// 侧边菜单宽度 ， 默认为256px
sideMenuWidth: number;
// 主题颜色索引
@@ -51,6 +54,8 @@ export interface AppConfig {
footerFlag: boolean;
// 帮助文档
helpDocFlag: boolean;
+ // 帮助文档默认展开
+ helpDocExpandFlag: boolean;
// 水印
watermarkFlag: boolean;
// 网站名称
diff --git a/smart-admin-web-typescript/src/utils/dict.ts b/smart-admin-web-typescript/src/utils/dict.ts
new file mode 100644
index 00000000..122d26a3
--- /dev/null
+++ b/smart-admin-web-typescript/src/utils/dict.ts
@@ -0,0 +1,22 @@
+import { useDictStore } from '/@/store/modules/system/dict';
+import { dictApi } from '/@/api/support/dict-api';
+
+/**
+ * 获取字典数据
+ */
+
+export function useDict(...args: any) {
+ let res: any = {};
+ args.forEach(async (keyCode: any, index: any) => {
+ res[keyCode] = [];
+ const dicts = useDictStore().getDict(keyCode);
+ if (dicts) {
+ res[keyCode] = dicts;
+ } else {
+ let result = await dictApi.valueList(keyCode);
+ res[keyCode] = result.data;
+ useDictStore().setDict(keyCode, res[keyCode]);
+ }
+ });
+ return res;
+}
diff --git a/smart-admin-web-typescript/src/utils/ployfill.ts b/smart-admin-web-typescript/src/utils/ployfill.ts
new file mode 100644
index 00000000..90923f6c
--- /dev/null
+++ b/smart-admin-web-typescript/src/utils/ployfill.ts
@@ -0,0 +1,14 @@
+//去除谷歌浏览器的scroll、wheel等事件警告
+(function () {
+ if (typeof EventTarget !== 'undefined') {
+ let func = EventTarget.prototype.addEventListener;
+ EventTarget.prototype.addEventListener = function (type, fn, capture) {
+ this.func = func;
+ if (typeof capture !== 'boolean') {
+ capture = capture || {};
+ capture.passive = false;
+ }
+ this.func(type, fn, capture);
+ };
+ }
+})();
diff --git a/smart-admin-web-typescript/src/views/business/erp/catalog/components/category-form-modal.vue b/smart-admin-web-typescript/src/views/business/erp/catalog/components/category-form-modal.vue
index 5cfe1521..85362100 100644
--- a/smart-admin-web-typescript/src/views/business/erp/catalog/components/category-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/erp/catalog/components/category-form-modal.vue
@@ -17,7 +17,7 @@
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
index 3a31a401..80d6b617 100644
--- a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
@@ -85,6 +85,21 @@
detail(enterpriseId);
}
visible.value = true;
+ nextTick(() => {
+ // 解决弹窗错误信息显示,没有可忽略
+ const domArr = document.getElementsByClassName('ant-modal');
+ if (domArr && domArr.length > 0) {
+ Array.from(domArr).forEach((item) => {
+ if (item.childNodes && item.childNodes.length > 0) {
+ Array.from(item.childNodes).forEach((child) => {
+ if (child.setAttribute) {
+ child.setAttribute('aria-hidden', 'false');
+ }
+ });
+ }
+ });
+ }
+ });
}
function onClose() {
diff --git a/smart-admin-web-typescript/src/views/business/oa/notice/notice-detail.vue b/smart-admin-web-typescript/src/views/business/oa/notice/notice-detail.vue
index 188c8661..057b9d4b 100644
--- a/smart-admin-web-typescript/src/views/business/oa/notice/notice-detail.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/notice-detail.vue
@@ -11,17 +11,17 @@
- 编辑
+ 编辑
{{ noticeDetail.noticeTypeName }}
- {{ noticeDetail.documentNumber }}
+ {{ noticeDetail.documentNumber ? noticeDetail.documentNumber : '无' }}
{{ noticeDetail.source }}
{{ noticeDetail.author }}
{{ noticeDetail.pageViewCount }}
{{ noticeDetail.userViewCount }}
{{ noticeDetail.createTime }}
{{ noticeDetail.publishTime }}
- {{ noticeDetail.publishFlag ? '已发布' : '待发布' }}
+ {{ noticeDetail.publishFlag ? '已发布' : '待发布' }}
{{ noticeDetail.deletedFlag ? '已删除' : '未删除' }}
diff --git a/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-list.vue b/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-list.vue
index 28baa0f6..3ff0ba4b 100644
--- a/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-list.vue
@@ -35,7 +35,7 @@
-
+
diff --git a/smart-admin-web-typescript/src/views/business/oa/notice/notice-list.vue b/smart-admin-web-typescript/src/views/business/oa/notice/notice-list.vue
index 88b865e7..495ae01c 100644
--- a/smart-admin-web-typescript/src/views/business/oa/notice/notice-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/notice/notice-list.vue
@@ -28,7 +28,7 @@
-
+
@@ -91,6 +91,9 @@
{{ text }}
+
+ {{ text ? text : '无' }}
+
{{ text ? '全部可见' : '部分可见' }}
{{ text ? '已发布' : '待发布' }}
@@ -145,7 +148,7 @@
noticeTypeId: undefined, //分类
keywords: '', //标题、作者、来源
documentNumber: '', //文号
- createUserId: undefined, //创建人
+ createUserName: undefined, //创建人
deletedFlag: undefined, //删除标识
createTimeBegin: null, //创建-开始时间
createTimeEnd: null, //创建-截止时间
@@ -195,7 +198,7 @@
ellipsis: true,
},
{
- title: '发布',
+ title: '发布状态',
dataIndex: 'publishFlag',
width: 80,
},
diff --git a/smart-admin-web-typescript/src/views/support/dict/index.vue b/smart-admin-web-typescript/src/views/support/dict/index.vue
index 3aa74584..b51d1948 100644
--- a/smart-admin-web-typescript/src/views/support/dict/index.vue
+++ b/smart-admin-web-typescript/src/views/support/dict/index.vue
@@ -43,7 +43,7 @@
新建
-
+
diff --git a/smart-admin-web-typescript/src/views/support/job/job-list.vue b/smart-admin-web-typescript/src/views/support/job/job-list.vue
index 519d56f4..99bc0dfb 100644
--- a/smart-admin-web-typescript/src/views/support/job/job-list.vue
+++ b/smart-admin-web-typescript/src/views/support/job/job-list.vue
@@ -124,24 +124,22 @@
-
-
@@ -152,7 +150,7 @@