From a23f7d5910585923ff323332e557f8f0ea98d293 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 16:27:20 +0800
Subject: [PATCH] UI展示，树展示
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 11 +++++++++++
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 2 +-
Source/ProjectWeb/src/page/index/index.vue | 4 ++--
Source/ProjectWeb/src/views/base/UIContentViewer.vue | 2 +-
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 1 -
Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue | 11 +++--------
Source/ProjectWeb/src/page/index/layout.vue | 5 +++++
7 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 52bf1b5..0750e3d 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -39,6 +39,17 @@
{{ item.name }}
</el-button>
</div>
+ <div v-else-if="type === 'tree'">
+ <el-button v-for="item in basicButtonList"
+ :key="item.oid"
+ :icon="item.paramVOS.webUiButtonIcon"
+ :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.webUiButtonType : 'primary') || 'primary'"
+ plain
+ size="small"
+ @click="buttonClick(item)">
+ {{ item.name }}
+ </el-button>
+ </div>
</div>
</template>
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 16d531f..5c04b55 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -25,7 +25,6 @@
</template>
<script>
-import {treeMenu} from '@/api/treeMyMenu'
import {validatenull} from '@/util/validate'
export default {
name: "dynamic-table",
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
index 30577f9..0c3e379 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
@@ -1,5 +1,6 @@
<template>
<div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
+ <dynamic-button :butttonList="componentVO.buttons" :selectList="checkDatas" type="tree"></dynamic-button>
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterText">
@@ -95,7 +96,7 @@
label: 'text'
},
lazy:this.componentVO.treeDefineVO.loadType == 'node',
- isMuti:true,
+ isMuti:false,
data:[],
checkDatas:[]
}
@@ -104,7 +105,6 @@
this.initData();
},
mounted() {
- console.log(this.$el.clientHeight)
},
methods: {
filterNode(value, data) {
@@ -2000,12 +2000,7 @@
//閫愮骇鍔犺浇
const parentOid = (node.level === 0) ? 0 : node.data.oid;
setTimeout(() => {
- const data = [{
- name: 'leaf',
- leaf: true
- }, {
- name: 'zone'
- }];
+ const data = this.data;
resolve(data);
}, 500);
diff --git a/Source/ProjectWeb/src/page/index/index.vue b/Source/ProjectWeb/src/page/index/index.vue
index 93689d3..93aec76 100644
--- a/Source/ProjectWeb/src/page/index/index.vue
+++ b/Source/ProjectWeb/src/page/index/index.vue
@@ -16,7 +16,7 @@
<search class="avue-view" v-show="isSearch"></search>
</transition>
<!-- 涓讳綋瑙嗗浘灞� -->
- <div style="height:100%;overflow-y:auto;overflow-x:hidden;" id="avue-view" v-show="!isSearch">
+ <div style="height:100%;overflow-y:auto;overflow-x:hidden;padding-bottom: 38px;box-sizing: border-box" id="avue-view" v-show="!isSearch">
<keep-alive>
<router-view class="avue-view" v-if="$route.meta.keepAlive"/>
</keep-alive>
@@ -152,6 +152,6 @@
<style lang="scss">
#avue-view > .avue-view{
height: 100%;
- padding: 0 6px !important;
+ padding: 0 !important;
}
</style>
diff --git a/Source/ProjectWeb/src/page/index/layout.vue b/Source/ProjectWeb/src/page/index/layout.vue
index 96976dd..bdd7cf2 100644
--- a/Source/ProjectWeb/src/page/index/layout.vue
+++ b/Source/ProjectWeb/src/page/index/layout.vue
@@ -6,3 +6,8 @@
<router-view class="avue-view" v-if="!$route.meta.keepAlive" />
</div>
</template>
+<style lang="scss">
+.avue-view{
+ padding: 0 6px!important;
+}
+</style>
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index 44104ce..62b9081 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -24,7 +24,7 @@
@setDataStore="setDataStore">
</UIContentArea>
</el-aside>
- <el-container style="height: 100%">
+ <el-container style="height: 100%;display: block">
<el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
<UIContentArea :key="'centerArea-'+uiDefineVO.oid" :areasData="uiDefineVO.centerAreas"
:dataStore="checkedData.centerArea"
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 56172a5..a021921 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -23,7 +23,7 @@
@setDataStore="setDataStore">
</UIContentArea>
</el-aside>
- <el-container style="height: 100%">
+ <el-container style="height: 100%;display: block">
<el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
<UIContentArea :key="'centerArea-'+uiDefineVO.oid" areas-name="centerAreaInDialog"
cradStyle=""
--
Gitblit v1.9.3