From 485125c2b5b8862a5295216b24cf28121d8ca169 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 11:32:07 +0800
Subject: [PATCH] 解决冲突
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 222 ++++++++++++++++++++++++++++--------------------------
1 files changed, 115 insertions(+), 107 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 692fee5..16d531f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -1,132 +1,87 @@
<template>
- <div>
- <avue-crud v-model="form"
+ <div :id="'UI-dynamic-'+areasName+componentVO.oid" class="UI-dynamic">
+ <avue-crud ref="dataTable"
+ v-model="form"
:data="tableList"
:option="option"
- :page.sync="page"
- :table-loading="loading">
+ :page.sync="pageType"
+ :table-loading="loading"
+ @row-click="rowClickChange"
+ @search-change='searchChange'
+ @selection-change="selectChange">
<!--top鍖哄煙鎸夐挳-->
<template slot="menuLeft" slot-scope="scope">
- <dynamic-button LocationType="top" type="table" @buttonClick="buttonClick"></dynamic-button>
+ <dynamic-button :butttonList="componentVO.buttons" :selectList="selectList" LocationType="top"
+ type="table"></dynamic-button>
</template>
<!--menu鍖哄煙鎸夐挳-->
<template slot="menu" slot-scope="scope">
- <dynamic-button LocationType="menu" type="table" @buttonClick="buttonClick"></dynamic-button>
+ <dynamic-button :butttonList="componentVO.buttons" :scope="scope" :selectList="selectList" LocationType="menu"
+ type="table"></dynamic-button>
</template>
</avue-crud>
- <!-- 琛ㄦ牸鍐呮寜閽搷浣滃璇濇琛ㄥ崟 -->
-<!-- <dynamic-form :visible.sync="visible" style="display: none"></dynamic-form>-->
</div>
</template>
<script>
+import {treeMenu} from '@/api/treeMyMenu'
+import {validatenull} from '@/util/validate'
export default {
name: "dynamic-table",
- props:{
- componentVO:{
- type:Object,
+ props: {
+ componentVO: {
+ type: Object,
default: {}
},
inDialog: {
type: Boolean,
default: false
},
- areasName:{
- type:String,
- default:''//westArea瀵艰埅鍖�
+ areasName: {
+ type: String,
+ default: ''//westArea瀵艰埅鍖�
},
- sourceData:{
+ sourceData: {
//鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
- type:Object,
+ type: Object,
default: {}
},
- paramVOS:{
- type:Object,
+ paramVOS: {
+ type: Object,
default: {}
+ },
+ isShow: {
+ //鎵�鍦ㄥ尯鍩熸槸鍚﹀凡鏄剧ず锛岄拡瀵箃ab鍜宑ollapse
+ type: Boolean,
+ default: true
+ },
+ dataStore: {
+ //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
+ type: Array,
+ default: []
+ },
+ tableType: {
+ type: String
}
},
data() {
return {
+ parentHeight: '100%',//褰撳墠缁勪欢鏍硅妭鐐瑰厓绱犻珮搴�
form: {},
loading: false,
- visible:false,
page: {
pageSize: 10,
currentPage: 1,
- total: 5,
+ total: 50,
},
- tableHeadList: [
- {
- align: "left",
- colspan: 1,
- field: "name",
- fieldType: "text",
- hidden: false,
- title: "鍚嶇О",
- width: 100,
- },
- {
- align: "left",
- colspan: 1,
- field: "code",
- fieldType: "text",
- hidden: false,
- title: "缂栫爜",
- width: 100
- },
- {
- align: "left",
- colspan: 1,
- comboxKey: "EnumReviewType",
- field: "reviewtypetext",
- fieldType: "combox",
- hidden: false,
- sortField: "reviewtype",
- title: "绫诲瀷",
- width: 80
- },
- {
- align: "left",
- colspan: 1,
- field: "content",
- fieldType: "textarea",
- hidden: false,
- title: "澶囨敞",
- width: 150
- },
- {
- align: "left",
- colspan: 1,
- comboxKey: "ProcessReviewLC${lcstatus}",
- field: "lcstatus_text",
- fieldType: "text",
- hidden: false,
- sortField: "lcstatus",
- title: "鐘舵��",
- width: 100
- },
- {
- align: "left",
- colspan: 1,
- field: "creator_name",
- fieldType: "text",
- hidden: false,
- sortField: "creator",
- title: "鍒涘缓浜�",
- width: 80
- },
- {
- align: "left",
- colspan: 1,
- dateFormate: "yyyy-MM-dd HH:mm:ss",
- field: "createtime",
- fieldType: "date",
- hidden: false,
- title: "鍒涘缓鏃ユ湡",
- width: 160
- }
- ],
+ simplePage: {
+ currentPage: 1,
+ total: 100,
+ pagerCount: 4,
+ layout: "prev, pager, next"
+ },
+ //琛ㄦ牸鏁版嵁
tableList: [
{
code: "20220102",
@@ -520,25 +475,32 @@
isfirstr: "1",
ts: "2022-02-18 14:35:53.177"
},
- ]
- }
- },
- computed: {
- option() {
- return {
+ ],
+ option: {
index: true,
addBtn: false,
editBtn: false,
delBtn: false,
- height: 'auto',
- // indexFixed:false,
- // menuFixed:false,
- column: this.updatedColumns,
- };
- },
+ selection: true,
+ tip: false,
+ height: '100%',
+ calcHeight: 15,
+ indexFixed: false,
+ menuFixed: false,
+ searchMenuSpan:12,
+ searchShow:false,
+ column: [],
+ },
+ selectList: [],
+ }
+ },
+ computed: {
updatedColumns() {
- return this.tableHeadList.map(item => {
+ const queryFields = !validatenull(this.componentVO.tableDefineVO.queryColumns) ? this.componentVO.tableDefineVO.queryColumns.map(item => item.field) : [];
+
+ return this.componentVO.tableDefineVO.cols[0].map(item => {
const typeValue = item.fieldType === 'text' || item.fieldType === 'combox' ? 'input' : item.fieldType; // 琛ㄥ崟Type绫诲瀷
+ const search = queryFields.includes(item.field); // 鍒ゆ柇 field 鏄惁鍦� queryColumns 閲�
return {
align: item.align,
@@ -548,14 +510,60 @@
hidden: item.hidden,
label: item.title,
width: item.width,
+ search: search
};
});
},
+ pageType() {
+ return this.areasName === 'westArea' ? this.simplePage : this.page;
+ }
+ },
+ watch: {
+ parentHeight: {
+ handler(newval) {
+ if (newval > 50) {
+ this.option.height = newval;
+ //doLayout涓嶇敓鏁堬紝鎵嬪姩璁剧疆琛ㄦ牸楂樺害
+ this.$children[0].$children[1].$children[1].$children[0].$el.style.height = newval + 'px';
+ /*this.$nextTick(() => {
+ if (this.$refs.dataTable && this.$refs.dataTable.doLayout) {
+ this.$refs.dataTable.doLayout();
+ }
+ })*/
+ }
+ }
+ },
+ isShow: {
+ handler(newval) {
+ if (newval && this.$el.clientHeight > 50) {
+ this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
+ }
+ }
+ }
+ },
+ created() {
+ this.option.column = this.updatedColumns;
+ },
+ mounted() {
+ if (this.$el.clientHeight > 50) {
+ //鐖跺厓绱犻珮搴�-鎸夐挳楂樺害-鍒嗛〉楂樺害
+ this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
+ }
},
methods: {
- buttonClick(id) {
- console.log(id)
- this.visible = true;
+ rowClickChange(row){
+ this.$refs.dataTable.toggleRowSelection(row);
+ },
+ selectChange(row) {
+ this.selectList = row;
+ },
+ searchChange(form,done){
+ console.log(form)
+ done()
+ this.$emit("setDataStore", {
+ area: this.areasName,
+ dataStore:row
+ });
}
}
}
--
Gitblit v1.9.3