@@ -70,12 +73,14 @@
props: ['columns', 'formatConditions'],
inject: ['table'],
created() {
- this.columns.forEach(item => {
- this.$set(item, 'search', {...item.search, visible: false, value: undefined, format: this.getFormat(item)})
- })
- console.log(this.columns)
+ this.formatColumns(this.columns)
},
watch: {
+ columns(newVal, oldVal) {
+ if (newVal != oldVal) {
+ this.formatColumns(newVal)
+ }
+ },
searchCols(newVal, oldVal) {
if (newVal.length != oldVal.length) {
const newConditions = this.getConditions(newVal)
@@ -218,6 +223,11 @@
return true
}
return false
+ },
+ formatColumns(columns) {
+ columns.forEach(item => {
+ this.$set(item, 'search', {...item.search, visible: false, value: undefined, format: this.getFormat(item)})
+ })
}
}
}
diff --git a/src/components/tool/AvatarList.vue b/src/components/tool/AvatarList.vue
index f2c0715..7390cce 100644
--- a/src/components/tool/AvatarList.vue
+++ b/src/components/tool/AvatarList.vue
@@ -35,7 +35,7 @@ const Item = {
return h(
'li',
{class: 'avatar-item'},
- [!this.$props.tips ? h(ATooltip, {props: {title: this.$props.tips}}, [avatar]) : avatar]
+ [this.$props.tips ? h(ATooltip, {props: {title: this.$props.tips}}, [avatar]) : avatar]
)
}
}
diff --git a/src/config/default/setting.config.js b/src/config/default/setting.config.js
index 361f158..19e736a 100644
--- a/src/config/default/setting.config.js
+++ b/src/config/default/setting.config.js
@@ -6,7 +6,7 @@ module.exports = {
mode: 'dark', //主题模式 可选 dark、 light 和 night
success: '#52c41a', //成功色
warning: '#faad14', //警告色
- error: '#f5222d', //错误色
+ error: '#f5222f', //错误色
},
layout: 'side', //导航布局，可选 side 和 head，分别为侧边导航和顶部导航
fixedHeader: false, //固定头部状态栏，true:固定，false:不固定
@@ -15,6 +15,7 @@ module.exports = {
pageWidth: 'fixed', //内容区域宽度，fixed:固定宽度，fluid:流式宽度
weekMode: false, //色弱模式，true:开启，false:不开启
multiPage: false, //多页签模式，true:开启，false:不开启
+ cachePage: true, //是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
hideSetting: false, //隐藏设置抽屉，true:隐藏，false:不隐藏
systemName: 'Vue Antd Admin', //系统名称
copyright: '2018 ICZER 工作室出品', //copyright
diff --git a/src/config/replacer/resolve.config.js b/src/config/replacer/resolve.config.js
index 6159da4..34c0db6 100644
--- a/src/config/replacer/resolve.config.js
+++ b/src/config/replacer/resolve.config.js
@@ -19,12 +19,24 @@ const cssResolve = {
return cssObj.toText()
}
},
+ '.ant-tree-checkbox-checked .ant-tree-checkbox-inner::after': {
+ resolve(cssText, cssObj) {
+ cssObj.rules.push('border-top:0', 'border-left:0')
+ return cssObj.toText()
+ }
+ },
'.ant-checkbox-checked .ant-checkbox-inner:after': {
resolve(cssText, cssObj) {
cssObj.rules.push('border-top:0', 'border-left:0')
return cssObj.toText()
}
},
+ '.ant-tree-checkbox-checked .ant-tree-checkbox-inner:after': {
+ resolve(cssText, cssObj) {
+ cssObj.rules.push('border-top:0', 'border-left:0')
+ return cssObj.toText()
+ }
+ },
'.ant-menu-dark .ant-menu-inline.ant-menu-sub': {
resolve(cssText, cssObj) {
cssObj.rules = cssObj.rules.filter(rule => rule.indexOf('box-shadow') == -1)
diff --git a/src/layouts/PageLayout.vue b/src/layouts/PageLayout.vue
index e936145..6ce29a8 100644
--- a/src/layouts/PageLayout.vue
+++ b/src/layouts/PageLayout.vue
@@ -60,10 +60,10 @@ export default {
this.updatePageHeight(0)
},
computed: {
- ...mapState('setting', ['layout', 'multiPage', 'pageMinHeight', 'pageWidth']),
+ ...mapState('setting', ['layout', 'multiPage', 'pageMinHeight', 'pageWidth', 'customTitles']),
pageTitle() {
let pageTitle = this.page && this.page.title
- return pageTitle === undefined ? (this.title || this.routeName) : this.$t(pageTitle)
+ return this.customTitle || (pageTitle && this.$t(pageTitle)) || this.title || this.routeName
},
routeName() {
const route = this.$route
@@ -90,11 +90,17 @@ export default {
...mapMutations('setting', ['correctPageMinHeight']),
getRouteBreadcrumb() {
let routes = this.$route.matched
+ const path = this.$route.path
let breadcrumb = []
- routes.forEach(route => {
+ routes.filter(item => path.includes(item.path))
+ .forEach(route => {
const path = route.path.length === 0 ? '/home' : route.path
breadcrumb.push(this.$t(getI18nKey(path)))
})
+ let pageTitle = this.page && this.page.title
+ if (this.customTitle || pageTitle) {
+ breadcrumb[breadcrumb.length - 1] = this.customTitle || pageTitle
+ }
return breadcrumb
},
/**
diff --git a/src/layouts/footer/PageFooter.vue b/src/layouts/footer/PageFooter.vue
index 6689c1c..7c0d079 100644
--- a/src/layouts/footer/PageFooter.vue
+++ b/src/layouts/footer/PageFooter.vue
@@ -26,6 +26,9 @@ export default {
.copyright{
color: @text-color-second;
font-size: 14px;
+ i {
+ margin: 0 4px;
+ }
}
.links{
margin-bottom: 8px;
diff --git a/src/layouts/tabs/TabsHead.vue b/src/layouts/tabs/TabsHead.vue
index 958662f..a660728 100644
--- a/src/layouts/tabs/TabsHead.vue
+++ b/src/layouts/tabs/TabsHead.vue
@@ -63,7 +63,7 @@
this.affixed = this.fixedTabs
},
computed: {
- ...mapState('setting', ['layout', 'pageWidth', 'fixedHeader', 'fixedTabs']),
+ ...mapState('setting', ['layout', 'pageWidth', 'fixedHeader', 'fixedTabs', 'customTitles']),
lockTitle() {
return this.$t(this.fixedTabs ? 'unlock' : 'lock')
}
@@ -95,7 +95,9 @@
this.$emit('contextmenu', pageKey, e)
},
pageName(page) {
- return this.$t(getI18nKey(page.keyPath))
+ const pagePath = page.fullPath.split('?')[0]
+ const custom = this.customTitles.find(item => item.path === pagePath)
+ return (custom && custom.title) || page.title || this.$t(getI18nKey(page.keyPath))
}
}
}
@@ -115,7 +117,7 @@
.icon-close{
font-size: 12px;
margin-left: 6px;
- margin-right: -4px;
+ margin-right: -4px !important;
color: @text-color-second;
&:hover{
color: @text-color;
diff --git a/src/layouts/tabs/TabsView.vue b/src/layouts/tabs/TabsView.vue
index b8461bc..beb8ae7 100644
--- a/src/layouts/tabs/TabsView.vue
+++ b/src/layouts/tabs/TabsView.vue
@@ -12,10 +12,10 @@
/>
@@ -40,11 +40,12 @@ export default {
pageList: [],
activePage: '',
menuVisible: false,
- refreshing: false
+ refreshing: false,
+ excludeKeys: []
}
},
computed: {
- ...mapState('setting', ['multiPage', 'animate', 'layout', 'pageWidth']),
+ ...mapState('setting', ['multiPage', 'cachePage', 'animate', 'layout', 'pageWidth']),
menuItemList() {
return [
{ key: '1', icon: 'vertical-right', text: this.$t('closeLeft') },
@@ -58,6 +59,7 @@ export default {
}
},
created () {
+ this.loadCacheConfig(this.$router?.options?.routes)
this.loadCachedTabs()
const route = this.$route
if (this.pageList.findIndex(item => item.fullPath === route.fullPath) === -1) {
@@ -79,6 +81,10 @@ export default {
this.correctPageMinHeight(this.tabsOffset)
},
watch: {
+ '$router.options.routes': function (val) {
+ this.excludeKeys = []
+ this.loadCacheConfig(val)
+ },
'$route': function (newRoute) {
this.activePage = newRoute.fullPath
if (!this.multiPage) {
@@ -249,6 +255,7 @@ export default {
return {
keyPath: route.matched[route.matched.length - 1].path,
fullPath: route.fullPath, loading: false,
+ title: route.meta && route.meta.page && route.meta.page.title,
unclose: route.meta && route.meta.page && (route.meta.page.closable === false),
}
},
@@ -260,7 +267,8 @@ export default {
const page = this.pageList.find(item => item.fullPath === route.fullPath)
page.unclose = route.meta && route.meta.page && (route.meta.page.closable === false)
if (!page._init_) {
- page.cachedKey = this.$refs.tabContent.$vnode.key
+ const vnode = this.$refs.tabContent.$vnode
+ page.cachedKey = vnode.key + vnode.componentOptions.Ctor.cid
page._init_ = true
}
},
@@ -282,6 +290,17 @@ export default {
}
}
},
+ loadCacheConfig(routes, pCache = true) {
+ routes.forEach(item => {
+ const cacheAble = item.meta?.page?.cacheAble ?? pCache ?? true
+ if (!cacheAble) {
+ this.excludeKeys.push(new RegExp(`${item.fullPath}\\d+$`))
+ }
+ if (item.children) {
+ this.loadCacheConfig(item.children, cacheAble)
+ }
+ })
+ },
...mapMutations('setting', ['correctPageMinHeight'])
}
}
diff --git a/src/main.js b/src/main.js
index 21e5667..9c8b12b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,6 +10,7 @@ import 'animate.css/source/animate.css'
import Plugins from '@/plugins'
import {initI18n} from '@/utils/i18n'
import bootstrap from '@/bootstrap'
+import 'moment/locale/zh-cn'
const router = initRouter(store.state.setting.asyncRoutes)
const i18n = initI18n('CN', 'US')
diff --git a/src/mock/goods/index.js b/src/mock/goods/index.js
index 4bdfa17..9af9e53 100644
--- a/src/mock/goods/index.js
+++ b/src/mock/goods/index.js
@@ -48,4 +48,59 @@ Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'),'get', ({ur
list: result
}
}
+})
+
+const columnsConfig = [
+ {
+ title: '商品名称',
+ dataIndex: 'name',
+ searchAble: true
+ },
+ {
+ title: '订单号',
+ dataIndex: 'orderId'
+ },
+ {
+ searchAble: true,
+ dataIndex: 'status',
+ dataType: 'select',
+ slots: {title: 'statusTitle'},
+ scopedSlots: {customRender: 'status'},
+ search: {
+ selectOptions: [
+ {title: '已下单', value: 1},
+ {title: '已付款', value: 2},
+ {title: '已审核', value: 3},
+ // {title: '已发货', value: 4}
+ ]
+ }
+ },
+ {
+ title: '发货',
+ searchAble: true,
+ dataIndex: 'send',
+ dataType: 'boolean',
+ scopedSlots: {customRender: 'send'}
+ },
+ {
+ title: '发货时间',
+ dataIndex: 'sendTime',
+ dataType: 'datetime'
+ },
+ {
+ title: '下单日期',
+ searchAble: true,
+ dataIndex: 'orderDate',
+ dataType: 'date',
+ visible: false
+ },
+ {
+ title: '审核时间',
+ dataIndex: 'auditTime',
+ dataType: 'time',
+ },
+]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
+ return columnsConfig
})
\ No newline at end of file
diff --git a/src/mock/user/login.js b/src/mock/user/login.js
index c8b0279..97db1a1 100644
--- a/src/mock/user/login.js
+++ b/src/mock/user/login.js
@@ -8,21 +8,32 @@ const user = Mock.mock({
position: '@POSITION'
})
Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/login`, 'post', ({body}) => {
- let result = {}
+ let result = {data: {}}
const {name, password} = JSON.parse(body)
- if (name !== 'admin' || password !== '888888') {
- result.code = -1
- result.message = '账户名或密码错误（admin/888888）'
+ let success = false
+
+ if (name === 'admin' && password === '888888') {
+ success = true
+ result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
+ result.data.roles = [{id: 'admin', operation: ['add', 'edit', 'delete']}]
+ } else if (name === 'test' || password === '888888') {
+ success = true
+ result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
+ result.data.roles = [{id: 'test', operation: ['add', 'edit', 'delete']}]
} else {
+ success = false
+ }
+
+ if (success) {
result.code = 0
result.message = Mock.mock('@TIMEFIX').CN + '，欢迎回来'
- result.data = {}
result.data.user = user
result.data.token = 'Authorization:' + Math.random()
result.data.expireAt = new Date(new Date().getTime() + 30 * 60 * 1000)
- result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
- result.data.roles = [{id: 'admin', operation: ['add', 'edit', 'delete']}]
+ } else {
+ result.code = -1
+ result.message = '账户名或密码错误（admin/888888 or test/888888）'
}
return result
})
diff --git a/src/pages/components/table/Table.vue b/src/pages/components/table/Table.vue
index 7625a10..be829c4 100644
--- a/src/pages/components/table/Table.vue
+++ b/src/pages/components/table/Table.vue
@@ -90,24 +90,19 @@
searchAble: true,
dataIndex: 'send',
dataType: 'boolean',
- scopedSlots: {customRender: 'send'}
- },
- {
- title: '发货时间',
- dataIndex: 'sendTime',
- dataType: 'datetime'
- },
- {
- title: '下单日期',
- searchAble: true,
- dataIndex: 'orderDate',
- dataType: 'date'
+ scopedSlots: {customRender: 'send'},
+ search: {
+ switchOptions: {
+ checkedText: '开',
+ uncheckedText: '关'
+ }
+ }
},
{
title: '审核时间',
dataIndex: 'auditTime',
dataType: 'time',
- },
+ }
],
dataSource: [],
conditions: {}
@@ -115,6 +110,7 @@
},
created() {
this.getGoodList()
+ this.getColumns()
},
methods: {
getGoodList() {
@@ -129,8 +125,12 @@
this.loading = false
})
},
+ getColumns() {
+ ds.goodsColumns().then(res => {
+ this.columns = res.data
+ })
+ },
onSearch(conditions, searchOptions) {
- console.log(conditions)
console.log(searchOptions)
this.page = 1
this.conditions = conditions
diff --git a/src/pages/list/QueryList.vue b/src/pages/list/QueryList.vue
index 0f9e58d..f5a1f4f 100644
--- a/src/pages/list/QueryList.vue
+++ b/src/pages/list/QueryList.vue
@@ -79,7 +79,7 @@
+ 
+