From 16913ea709f434cfebe71fd0c66b0a6931398f3e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 十二月 2023 08:56:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Master/MasterTree.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index c1e383e..9f9a378 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,12 +1,14 @@
<template>
- <div class="app" style="display: flex;">
+ <div class="app" style="position: relative;">
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
:option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
<template slot-scope="{ node }">
- <span v-html="node.label"></span>
+ <el-tooltip class="item" effect="dark" open-delay="350" :content="$createElement('div', { domProps: { innerHTML: node.label } })" placement="right-start">
+ <span id="labelSize" v-html="node.label" ></span>
+ </el-tooltip>
</template>
</avue-tree>
- <div style="display: inline-block;">
+ <div style="position: absolute; right: 3px; top: -1px;">
<el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
</div>
</div>
@@ -147,12 +149,17 @@
},
//琛ㄦ牸鍒锋柊
TableRend() {
+ this.loading = true;
+ this.$emit('loading', this.loading)
TableData({
templateOid: this.templateOids,
codeClassifyOid: this.nodeClickList.oid,
page: this.currentPage,
limit: this.pageSize,
}).then(res => {
+ // console.log('tab',res)
+ this.loading = false;
+ this.$emit('loading', this.loading)
this.tableDataArray = res.data.data;
this.$emit('tableDataArray', this.tableDataArray)
this.$emit('total', res.data.total)
@@ -181,7 +188,7 @@
List.forEach(item => {
let columnItem = {
label: item.title,
- prop: item.queryField,
+ prop: item.field,
// type: this.columnType[item.type],
sortable: item.sort,
width: item.minWidth
@@ -209,8 +216,9 @@
this.tableHeadFindData = []
await this.TableHeadRend(); // 鍏堟墽琛� TableHeadRend()
this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
- this.$emit('nodeClick', this.templateOids)
+ this.$emit('nodeClickTemplateOids', this.templateOids)
this.$emit("codeClassifyOid", this.nodeClickList.oid)
+ this.$emit("nodeClickList", this.nodeClickList)
} catch (error) {
// 澶勭悊閿欒
this.$message.error(error)
@@ -247,4 +255,7 @@
margin-left: 6px;
font-size: 18px;
}
+#labelSize{
+ font-size: 14px !important;
+}
</style>
--
Gitblit v1.9.3