no message
parent
e8b73916c9
commit
e0fd0fcdd5
|
|
@ -2,6 +2,6 @@ ENV = 'production'
|
|||
|
||||
# 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
|
||||
# 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
|
||||
VUE_APP_BASE_API = 'http://localhost:8010'
|
||||
VUE_APP_BASE_API = 'http://115.159.67.99:8010'
|
||||
# 如果接口是 http 形式， wss 需要改为 ws
|
||||
VUE_APP_WS_API = 'wss://localhost:8010'
|
||||
VUE_APP_WS_API = 'wss://115.159.67.99:8010'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="crud-opts">
|
||||
<span class="crud-opts-left">
|
||||
<!--左侧插槽-->
|
||||
<slot name="left"/>
|
||||
<slot name="left" />
|
||||
<el-button
|
||||
v-if="crud.optShow.add"
|
||||
v-permission="permission.add"
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
@click="crud.doExport"
|
||||
>导出</el-button>
|
||||
<!--右侧-->
|
||||
<slot name="right"/>
|
||||
<slot name="right" />
|
||||
</span>
|
||||
<el-button-group class="crud-opts-right">
|
||||
<el-button
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import CRUD, {crud} from '@crud/crud'
|
||||
import CRUD, { crud } from '@crud/crud'
|
||||
import crudTableConfig from '@/api/tableConfig'
|
||||
import Sortable from 'sortablejs'
|
||||
|
||||
|
|
@ -130,28 +130,22 @@ export default {
|
|||
props: {
|
||||
permission: {
|
||||
type: Object,
|
||||
default: () => {
|
||||
return {}
|
||||
}
|
||||
default: () => { return {} }
|
||||
},
|
||||
ignoreColumns: {
|
||||
type: Array,
|
||||
default: () => {
|
||||
return []
|
||||
}
|
||||
default: () => { return [] }
|
||||
},
|
||||
tableKey: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
default: () => { return '' }
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
hiddenColumns: [],
|
||||
table_configs: [],
|
||||
table_configs_xs: [],
|
||||
hiddenColumns:[],
|
||||
table_configs:[],
|
||||
table_configs_xs:[],
|
||||
tableColumns: [],
|
||||
allColumnsSelected: true,
|
||||
allColumnsSelectedIndeterminate: false,
|
||||
|
|
@ -178,45 +172,62 @@ export default {
|
|||
mounted() {
|
||||
//初始化数据
|
||||
this.columnDrop();
|
||||
this.hiddenColumns = JSON.parse(sessionStorage.getItem(this.tableKey));
|
||||
setTimeout(() => {
|
||||
// 方法区
|
||||
this.initcolumn();
|
||||
}, 600)
|
||||
setTimeout(() => {
|
||||
// 方法区
|
||||
this.showcolumn();
|
||||
}, 1000)
|
||||
}, 200)
|
||||
|
||||
|
||||
},
|
||||
methods: {
|
||||
|
||||
initcolumn() {
|
||||
this.updateTableColumns()
|
||||
const strHidden=sessionStorage.getItem(this.tableKey)
|
||||
this.hiddenColumns= JSON.parse(strHidden);
|
||||
if(this.hiddenColumns.length>0){
|
||||
console.log("------移除---------------")
|
||||
const table = this.crud.props.table
|
||||
this.table_configs_xs.forEach((column, index) => {
|
||||
this.table_configs_xs.forEach((column,index) => {
|
||||
const vm = table.$children.find(e => e.label === column.label)
|
||||
|
||||
const columnConfig = vm.columnConfig
|
||||
|
||||
|
||||
console.log(columnConfig)
|
||||
vm.owner.store.commit('removeColumn', columnConfig, null)
|
||||
|
||||
})
|
||||
this.ignoreNextTableColumnsChange = false
|
||||
console.log("--------移除完成-------------")
|
||||
setTimeout(() => {
|
||||
// 方法区
|
||||
this.showcolumn();
|
||||
}, 200)
|
||||
}
|
||||
|
||||
//vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex + 1 , null)
|
||||
|
||||
|
||||
},
|
||||
showcolumn() {
|
||||
console.log("------显示列------")
|
||||
const strHidden=sessionStorage.getItem(this.tableKey)
|
||||
this.hiddenColumns= JSON.parse(strHidden);
|
||||
const table = this.crud.props.table
|
||||
if(this.hiddenColumns!== undefined && this.hiddenColumns!=null){
|
||||
this.hiddenColumns.forEach((column, index) => {
|
||||
this.hiddenColumns.forEach((column,index) => {
|
||||
|
||||
const vm = table.$children.find(e => e.prop === column.property)
|
||||
const columnConfig = vm.columnConfig
|
||||
if (column.visible) {
|
||||
columnConfig.width = column.width
|
||||
columnConfig.visible = column.visible
|
||||
vm.owner.store.commit('insertColumn', columnConfig, index + 1, null)
|
||||
console.log(columnConfig.label)
|
||||
if(column.visible){
|
||||
columnConfig.width=column.width
|
||||
columnConfig.visible=column.visible
|
||||
vm.owner.store.commit('insertColumn', columnConfig, index+1 , null)
|
||||
}
|
||||
|
||||
})
|
||||
this.updateTableColumns();
|
||||
}
|
||||
|
||||
console.log("------显示列完成------")
|
||||
this. updateTableColumns();
|
||||
},
|
||||
//列拖拽
|
||||
columnDrop() {
|
||||
|
|
@ -226,49 +237,51 @@ export default {
|
|||
delay: 0,
|
||||
onEnd: evt => {
|
||||
// 根据中文label进行拖拉
|
||||
this.ColumnsDrop(evt.item.innerText, evt.newIndex)
|
||||
this.ColumnsDrop(evt.item.innerText,evt.newIndex)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
//新加方法
|
||||
ColumnsDrop(oldText, newIndex) {
|
||||
ColumnsDrop(oldText,newIndex) {
|
||||
const table = this.crud.props.table
|
||||
let myindex = -1 //空格
|
||||
let oldIndex1 = 0
|
||||
let step = -1
|
||||
let count = 0
|
||||
//
|
||||
this.tableColumns.some((column, index) => {
|
||||
if (column.visible) {
|
||||
this.tableColumns.some((column,index) => {
|
||||
if(column.visible) {
|
||||
count++
|
||||
}
|
||||
})
|
||||
// 定位拖拉中文表头位置以及在该字段之前隐藏字段数量
|
||||
this.tableColumns.some((column, index) => {
|
||||
if (column.label === oldText) {
|
||||
this.tableColumns.some((column,index) => {
|
||||
if(column.label === oldText) {
|
||||
oldIndex1 = index
|
||||
return true
|
||||
} else {
|
||||
}else{
|
||||
// 空格在字段前面
|
||||
if (step > index) {
|
||||
if(step>index){
|
||||
myindex++
|
||||
}
|
||||
}
|
||||
step++
|
||||
})
|
||||
if (myindex === -1) {
|
||||
if (myindex === -1 ) {
|
||||
myindex = 0
|
||||
}
|
||||
let item = this.tableColumns[oldIndex1]
|
||||
let item= this.tableColumns[oldIndex1]
|
||||
const vm = table.$children.find(e => e.prop === item.property)
|
||||
const columnConfig = vm.columnConfig
|
||||
if (oldIndex1 < newIndex) { // 从左至右拖动
|
||||
vm.owner.store.commit('insertColumn', columnConfig, newIndex + myindex, null)
|
||||
/*this.tableColumns.splice(oldIndex1-1, 1)
|
||||
this.tableColumns.splice(myindex-1, 0, item)*/
|
||||
if(oldIndex1 <newIndex){ // 从左至右拖动
|
||||
vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex , null)
|
||||
vm.owner.store.commit('removeColumn', columnConfig, null)
|
||||
} else { //从右至左拖动
|
||||
}else { //从右至左拖动
|
||||
vm.owner.store.commit('removeColumn', columnConfig, null)
|
||||
vm.owner.store.commit('insertColumn', columnConfig, newIndex + myindex, null)
|
||||
vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex , null)
|
||||
}
|
||||
// 列重新排序
|
||||
this.ignoreNextTableColumnsChange = false
|
||||
|
|
@ -292,6 +305,7 @@ export default {
|
|||
const fullTableColumns = table.$children.map(e => e.columnConfig).filter(columnFilter)
|
||||
cols = sortWithRef(fullTableColumns, refCols)
|
||||
cols.forEach(config => {
|
||||
|
||||
const column = {
|
||||
property: config.property,
|
||||
label: config.label,
|
||||
|
|
@ -338,7 +352,7 @@ export default {
|
|||
})
|
||||
if (selectedCount === 0) {
|
||||
this.crud.notify('请至少选择一列', CRUD.NOTIFICATION_TYPE.WARNING)
|
||||
this.$nextTick(function () {
|
||||
this.$nextTick(function() {
|
||||
item.visible = true
|
||||
})
|
||||
return
|
||||
|
|
@ -346,9 +360,23 @@ export default {
|
|||
this.allColumnsSelected = selectedCount === totalCount
|
||||
this.allColumnsSelectedIndeterminate = selectedCount !== totalCount && selectedCount !== 0
|
||||
this.updateColumnVisible(item)
|
||||
/*const columns = []
|
||||
this.tableColumns.forEach(column => {
|
||||
if(column.visible==false){
|
||||
columns.push(column.property)
|
||||
}
|
||||
console.log("-"+column.property+"--"+column.visible)
|
||||
})
|
||||
const post_table_config = {
|
||||
value: JSON.stringify(columns),
|
||||
tableType: this.tableKey
|
||||
}
|
||||
|
||||
crudTableConfig.add(post_table_config)*/
|
||||
//this.postToTableConfig();
|
||||
},
|
||||
postToTableConfig() {
|
||||
this.updateTableColumns();
|
||||
postToTableConfig(){
|
||||
this. updateTableColumns();
|
||||
const columns = []
|
||||
this.tableColumns.forEach(column => {
|
||||
const table_config = {
|
||||
|
|
@ -364,11 +392,11 @@ export default {
|
|||
tableType: this.tableKey
|
||||
}
|
||||
|
||||
this.crud.loading = true
|
||||
this.crud.loading=true
|
||||
crudTableConfig.add(post_table_config).then(res => {
|
||||
setTimeout(() => {
|
||||
// 方法区
|
||||
this.crud.loading = false
|
||||
this.crud.loading=false
|
||||
}, 500)
|
||||
|
||||
})
|
||||
|
|
@ -383,7 +411,7 @@ export default {
|
|||
if (item.visible) {
|
||||
// 找出合适的插入点
|
||||
const columnIndex = this.tableColumns.indexOf(item)
|
||||
vm.owner.store.commit('insertColumn', columnConfig, columnIndex + 1, null)
|
||||
vm.owner.store.commit('insertColumn', columnConfig, columnIndex+1, null)
|
||||
} else {
|
||||
vm.owner.store.commit('removeColumn', columnConfig, null)
|
||||
}
|
||||
|
|
@ -403,11 +431,9 @@ export default {
|
|||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.crud-opts .crud-opts-right {
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.crud-opts .crud-opts-right span {
|
||||
float: left;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue