From 3ba03559aaaf79b21be7008715e0bdb03c293bd0 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 29 三月 2024 14:51:13 +0800
Subject: [PATCH] UI上下文展示引擎
---
Source/ProjectWeb/src/components/refer/vciWebReferTable.vue | 12 ++++--
Source/ProjectWeb/src/components/refer/vciWebRefer.vue | 6 +-
Source/ProjectWeb/src/components/refer/vciWebReferDefalut.vue | 13 ++++--
Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue | 39 +++++++++----------
Source/ProjectWeb/src/views/wel/index.vue | 4 +-
5 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/Source/ProjectWeb/src/components/refer/vciWebRefer.vue b/Source/ProjectWeb/src/components/refer/vciWebRefer.vue
index 8607636..ac98659 100644
--- a/Source/ProjectWeb/src/components/refer/vciWebRefer.vue
+++ b/Source/ProjectWeb/src/components/refer/vciWebRefer.vue
@@ -178,10 +178,10 @@
},
data() {
return {
- refertype: this.referConfig.type,
+ refertype: this.referConfig.options.type,
emitData: {},
- width:this.referConfig.width || '900px',
- height:this.referConfig.height || '600px'
+ width:this.referConfig.options.width || '900px',
+ height:this.referConfig.options.height || '500px'
};
},
computed: {
diff --git a/Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue b/Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue
index 6cc1956..61847dd 100644
--- a/Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue
+++ b/Source/ProjectWeb/src/components/refer/vciWebReferClassify.vue
@@ -3,7 +3,6 @@
<div>
<el-dialog
v-dialogDrag
- :height="options.height || '70vh'"
:title="title"
:visible.sync="visible"
:width="onlyTable?'60%': '80%'"
@@ -11,7 +10,7 @@
class="avue-dialog avue-dialog--top"
@close="dialogClose"
>
- <el-container>
+ <el-container :style="{ 'height': height || '60vh' }">
<el-aside width="300px" v-if="!onlyTable && classifys.length>0">
<el-tabs type="border-card" style="height: 100%" @tab-click="tabClick"
v-model="tabName">
@@ -107,12 +106,14 @@
referType: {
type: String,
default: "",
- }, width: {
+ },
+ width: {
type: String,
- default:'70%'
- }, height: {
+ default:'80%'
+ },
+ height: {
type: String,
- default:'60%'
+ default:'500px'
},
reloadFormKey: {
type: String,
@@ -532,21 +533,19 @@
},
initTreeData: function (nodes) {
let treeData = [];
- if(nodes && Array.isArray(nodes)){
- nodes.forEach((item) => {
- let children = item.children;
- if (children) {
- children = this.initTreeData(children);
- }
- treeData.push({
- label: item[this.props.label],
- value: item[this.props.value],
- leaf: !item.children,
- children: children,
- attributes: item,
- });
+ nodes.forEach((item) => {
+ let children = item.children;
+ if (children) {
+ children = this.initTreeData(children);
+ }
+ treeData.push({
+ label: item[this.props.label],
+ value: item[this.props.value],
+ leaf: !item.children,
+ children: children,
+ attributes: item,
});
- }
+ });
return treeData;
},
filterNode(value, data) {
diff --git a/Source/ProjectWeb/src/components/refer/vciWebReferDefalut.vue b/Source/ProjectWeb/src/components/refer/vciWebReferDefalut.vue
index 00a8097..f704b53 100644
--- a/Source/ProjectWeb/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/ProjectWeb/src/components/refer/vciWebReferDefalut.vue
@@ -1,9 +1,9 @@
<template>
<div>
<el-dialog v-dialogDrag
- :height="options.height|| 'auto'" :title="title"
+ :title="title"
:visible.sync="visible"
- :width="options.width|| '450'"
+ :width="width|| '450'"
:append-to-body="true"
class="avue-dialog avue-dialog--top"
@close="dialogClose">
@@ -67,12 +67,14 @@
referType: {
type: String,
default:''
- }, width: {
+ },
+ width: {
type: String,
default:'70%'
- }, height: {
+ },
+ height: {
type: String,
- default:'60%'
+ default:'500px'
},
reloadFormKey: {
type: String,
@@ -107,6 +109,7 @@
option: {
addBtn: false,
columnBtn: false,
+ height:this.height,
calcHeight: 30,
tip: false,
menu: false,
diff --git a/Source/ProjectWeb/src/components/refer/vciWebReferTable.vue b/Source/ProjectWeb/src/components/refer/vciWebReferTable.vue
index d6b6eef..4771f2f 100644
--- a/Source/ProjectWeb/src/components/refer/vciWebReferTable.vue
+++ b/Source/ProjectWeb/src/components/refer/vciWebReferTable.vue
@@ -1,9 +1,10 @@
<template>
<div>
<el-dialog v-dialogDrag
- :height="height|| 'auto'" :title="title"
+ :title="title"
:visible.sync="visible"
:width="width"
+ :style="'height:'+height || 'auto'"
:append-to-body="true"
class="avue-dialog avue-dialog--top"
@close="dialogClose">
@@ -70,12 +71,14 @@
referType: {
type: String,
default:''
- }, width: {
+ },
+ width: {
type: String,
default:'70%'
- }, height: {
+ },
+ height: {
type: String,
- default:'60%'
+ default:'500px'
},
reloadFormKey: {
type: String,
@@ -110,6 +113,7 @@
option: {
addBtn: false,
columnBtn: false,
+ height:this.height,
calcHeight: 30,
tip: false,
menu: false,
diff --git a/Source/ProjectWeb/src/views/wel/index.vue b/Source/ProjectWeb/src/views/wel/index.vue
index 14e9ab6..5afdcc8 100644
--- a/Source/ProjectWeb/src/views/wel/index.vue
+++ b/Source/ProjectWeb/src/views/wel/index.vue
@@ -1,10 +1,10 @@
<template>
<div>
- <el-row>
+ <!--<el-row>
<el-col :span="24">
<third-register></third-register>
</el-col>
- </el-row>
+ </el-row>-->
<el-row>
<el-col :span="24">
<basic-container>
--
Gitblit v1.9.3