From 65191b3b25182dcc42ccb3fe75bbaa172084c92e Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 10 Dec 2021 12:05:52 +0800
Subject: [PATCH] 【#3232】JS增强中获取用户名为空 【issues/I4KTU1】点击查询不会清空列表选中行 【issues/I4K3Z7】横板顶部栏导航，会把退出登陆按钮挤掉 【#3225】常见案例-自定义组件-cron表达式显示错误
---
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue | 11 ++++++-----
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js | 16 ++++++++--------
ant-design-vue-jeecg/src/components/page/GlobalHeader.vue | 4 ++--
ant-design-vue-jeecg/src/mixins/JeecgListMixin.js | 4 ++++
ant-design-vue-jeecg/src/store/getters.js | 4 ++--
5 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
index 5082437..26a1433 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
@@ -145,8 +145,8 @@ export default {
if (this.hideYear || this.hideSecond) return v
const vs = v.split(' ')
if (vs.length >= 6) {
- // 转成 Quartz 的规则
- vs[5] = this.convertWeekToQuartz(vs[5])
+ // 将 Quartz 星期 的规则转换为 CronParser 的规则
+ vs[5] = this.convertQuartzWeekToCParser(vs[5])
}
return vs.slice(0, vs.length - 1).join(' ')
},
@@ -230,9 +230,10 @@ export default {
if (values.length > i) this.year = values[i]
this.assignInput()
},
- // Quartz 的规则：
- // 1 = 周日，2 = 周一，3 = 周二，4 = 周三，5 = 周四，6 = 周五，7 = 周六
- convertWeekToQuartz(week) {
+ // 将 Quartz 星期 的规则转换为 CronParser 的规则：
+ // Quartz 的规则：1 = 周日，2 = 周一，3 = 周二，4 = 周三，5 = 周四，6 = 周五，7 = 周六
+ // CronParser 的规则： 0 = 周日，1 = 周一，2 = 周二，3 = 周三，4 = 周四，5 = 周五，6 = 周六，7 = 周日
+ convertQuartzWeekToCParser(week) {
let convert = (v) => {
if (v === '0') {
return '1'
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js
index e076ee1..67cfa75 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js
@@ -1,11 +1,11 @@
export const WEEK_MAP_EN = {
- 'SUN': '0',
- 'MON': '1',
- 'TUE': '2',
- 'WED': '3',
- 'THU': '4',
- 'FRI': '5',
- 'SAT': '6'
+ 'SUN': '1',
+ 'MON': '2',
+ 'TUE': '3',
+ 'WED': '4',
+ 'THU': '5',
+ 'FRI': '6',
+ 'SAT': '7'
}
export const replaceWeekName = (c) => {
@@ -14,7 +14,7 @@ export const replaceWeekName = (c) => {
Object.keys(WEEK_MAP_EN).forEach(k => {
c = c.replace(new RegExp(k, 'g'), WEEK_MAP_EN[k])
})
- c = c.replace(new RegExp('7', 'g'), '0')
+ // c = c.replace(new RegExp('7', 'g'), '0')
}
// console.info('after: ' + c)
return c
diff --git a/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue b/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
index cfd525d..4463912 100644
--- a/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
+++ b/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
@@ -150,10 +150,10 @@
this.topMenuStyle.headerIndexRight = {}
this.topMenuStyle.headerIndexLeft = {}
} else {
- let rightWidth = '360px'
+ let rightWidth = '400px'
this.topMenuStyle.topNavHeader = { 'min-width': '165px' }
this.topMenuStyle.topSmenuStyle = { 'width': 'calc(100% - 165px)' }
- this.topMenuStyle.headerIndexRight = { 'min-width': rightWidth }
+ this.topMenuStyle.headerIndexRight = { 'min-width': rightWidth, 'white-space': 'nowrap' }
this.topMenuStyle.headerIndexLeft = { 'width': `calc(100% - ${rightWidth})` }
}
}
diff --git a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
index db66589..2a09ddf 100644
--- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
+++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
@@ -147,6 +147,10 @@ export const JeecgListMixin = {
},
searchQuery() {
this.loadData(1);
+ // 点击查询清空列表选中行
+ // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
+ this.selectedRowKeys = []
+ this.selectionRows = []
},
superQuery() {
this.$refs.superQueryModal.show();
diff --git a/ant-design-vue-jeecg/src/store/getters.js b/ant-design-vue-jeecg/src/store/getters.js
index a6a1e81..645e1b4 100644
--- a/ant-design-vue-jeecg/src/store/getters.js
+++ b/ant-design-vue-jeecg/src/store/getters.js
@@ -6,8 +6,8 @@ const getters = {
color: state => state.app.color,
token: state => state.user.token,
avatar: state => {state.user.avatar = Vue.ls.get(USER_INFO).avatar; return state.user.avatar},
- username: state => state.user.username,
- nickname: state => {state.user.realname = Vue.ls.get(USER_INFO).realname; return state.user.realname},
+ username: state => state.user.info.username,
+ nickname: state => {state.user.info.realname = Vue.ls.get(USER_INFO).realname; return state.user.info.realname},
welcome: state => state.user.welcome,
permissionList: state => state.user.permissionList,
userInfo: state => {state.user.info = Vue.ls.get(USER_INFO); return state.user.info},
--
libgit2 0.22.2