diff --git a/.env.development b/.env.development
index f2d3a2f75..be4979db7 100644
--- a/.env.development
+++ b/.env.development
@@ -15,5 +15,5 @@ VUE_APP_PUBLIC_PATH = '/ui/'
VUE_CLI_BABEL_TRANSPILE_MODULES = true
# External auth
-LOGIN_PATH = '/core/auth/login/'
-LOGOUT_PATH = '/core/auth/logout/'
+VUE_APP_LOGIN_PATH = '/core/auth/login/'
+VUE_APP_LOGOUT_PATH = '/core/auth/logout/'
diff --git a/.env.production b/.env.production
index 0ecd05632..79f3544df 100644
--- a/.env.production
+++ b/.env.production
@@ -3,9 +3,9 @@ ENV = 'production'
# base api
VUE_APP_BASE_API = '/'
-PUBLIC_PATH = '/ui'
+VUE_APP_PUBLIC_PATH = '/ui'
# External auth
-LOGIN_PATH = '/core/auth/login/'
-LOGOUT_PATH = '/core/auth/logout/
+VUE_APP_LOGIN_PATH = '/core/auth/login/'
+VUE_APP_LOGOUT_PATH = '/core/auth/logout/
diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index 629eac71f..34cb5d29a 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -20,7 +20,7 @@ export default {
return {
loading: true,
method: 'get',
- iConfig: {},
+ totalConfig: {},
meta: {}
}
},
@@ -33,9 +33,8 @@ export default {
this.$store.dispatch('common/getUrlMeta', { url: url }).then(data => {
this.meta = data.actions[this.method.toUpperCase()] || {}
this.generateColumns()
- }).catch(() => {
- this.$log.error('Error occur: ')
- // this.iConfig = this.config
+ }).catch((error) => {
+ this.$log.error('Error occur: ', error)
}).finally(() => {
this.loading = false
})
@@ -51,9 +50,9 @@ export default {
prop: 'id',
label: this.$t('common.Actions'),
align: 'center',
- formatter: ActionsFormatter,
width: '150px',
- actions: this.config.actions || {}
+ formatter: ActionsFormatter,
+ formatterArgs: {}
}
break
case 'is_valid':
diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
index 7fef63d4b..66b8c6f6e 100644
--- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue
+++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue
@@ -962,6 +962,11 @@ export default {
this.innerQuery = attrs
return this.getList()
},
+ searchDate(attrs) {
+ this.extraQuery = attrs
+ return this.getList()
+ },
+
/**
* 重置查询,相当于点击「重置」按钮
*
diff --git a/src/components/DataTable/index.vue b/src/components/DataTable/index.vue
index 0842c720d..a0758a303 100644
--- a/src/components/DataTable/index.vue
+++ b/src/components/DataTable/index.vue
@@ -99,6 +99,9 @@ export default {
getData() {
return this.$refs.table.data
},
+ searchDate(attrs) {
+ return this.$refs.table.searchDate(attrs)
+ },
search(attrs) {
return this.$refs.table.search(attrs)
},
diff --git a/src/components/DateTimePicker/index.vue b/src/components/DateTimePicker/index.vue
new file mode 100644
index 000000000..c98e7c96f
--- /dev/null
+++ b/src/components/DateTimePicker/index.vue
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
diff --git a/src/components/ListTable/TableAction/index.vue b/src/components/ListTable/TableAction/index.vue
index f33cf3930..ef3cae653 100644
--- a/src/components/ListTable/TableAction/index.vue
+++ b/src/components/ListTable/TableAction/index.vue
@@ -3,11 +3,13 @@
@@ -18,21 +20,24 @@