From 421ddd26a852c46e703391bddda6638956468582 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 十二月 2023 15:29:13 +0800
Subject: [PATCH] 参照referConfig为空报错处理
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 18 +++++++++---------
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 6 +++---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 18 +++++++++---------
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 1 +
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 73d8a17..e59f156 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -25,6 +25,7 @@
<template v-for="item in slotColumnList" :slot="item.prop + ''">
<vciWebRefer
v-if="item.type == 'refer'" :key="item.dataKey"
+ referType="master"
:data-key="item.dataKey"
:disabled="item.disabled"
:display="item.display"
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index 046f761..bfa314c 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -1,8 +1,8 @@
<template>
<div v-if="display">
<vciWebReferTree :key="key" :data-key="key" ref="vciWebReferTree" v-if="refertype=='tree'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTree>
- <vciWebReferTable :key="key" :data-key="key" v-else-if="refertype=='table'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTable>
- <vciWebReferDefalut :key="key" :data-key="key" v-else @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferDefalut>
+ <vciWebReferTable :key="key" :data-key="key" v-else-if="refertype=='table'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig" :referType="referType"></vciWebReferTable>
+ <vciWebReferDefalut :key="key" :data-key="key" v-else @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig" :referType="referType"></vciWebReferDefalut>
</div>
</template>
@@ -13,7 +13,7 @@
import vciWebReferDefalut from "./vciWebReferDefalut.vue";
export default {
name: "vciWebRefer",
- props: ["referConfig","value","text","disabled","display",'key'],
+ props: ["referConfig","value","text","disabled","display",'key','referType'],
components: {vciWebReferTree, vciWebReferTable, vciWebReferDefalut},
data() {
return {
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 6843c81..04575e8 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -38,7 +38,7 @@
import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
export default {
name: "vciWebReferDefalut",
- props:["referConfig","value","text","title","disabled"],
+ props:["referConfig","value","text","title","disabled","referType"],
data() {
return {
visible: false,
@@ -55,7 +55,7 @@
query: {},
loading: false,
page: {
- layout: "total,pager,prev, next,jumper",
+ layout: this.referType === "master" ? "total,pager,prev, next,jumper" : "total,pager,prev, next,jumper,sizes",
pageSize: 10,
currentPage: 1,
total: this.referConfig.options.data?this.referConfig.options.data.length :0
@@ -86,13 +86,13 @@
this.getParams();
},
mounted() {
- if(this.referConfig.options.tableConfig.page){
- this.page.pageSize=this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
- this.page.currentPage=this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
- }else if(!validatenull(this.referConfig.options.limit)){
- this.page.pageSize=this.referConfig.options.limit
- }else if(!validatenull(this.referConfig.options.tableConfig.limit)){
- this.page.pageSize=this.referConfig.options.tableConfig.limit
+ if (this.referConfig.options.tableConfig && this.referConfig.options.tableConfig.page) {
+ this.page.pageSize = this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+ this.page.currentPage = this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
+ } else if (!validatenull(this.referConfig.options.limit)) {
+ this.page.pageSize = this.referConfig.options.limit;
+ } else if (this.referConfig.options.tableConfig && !validatenull(this.referConfig.options.tableConfig.limit)) {
+ this.page.pageSize = this.referConfig.options.tableConfig.limit;
}
},
computed:{
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index f30eaf8..3251134 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -41,7 +41,7 @@
import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
export default {
name: "vciWebReferTable",
- props:["referConfig","value","text","title","disabled"],
+ props:["referConfig","value","text","title","disabled","referType"],
data() {
return {
visible: false,
@@ -57,7 +57,7 @@
query: {},
loading: false,
page: {
- layout: "total,pager,prev, next,jumper",
+ layout: this.referType === "master" ? "total,pager,prev, next,jumper" : "total,pager,prev, next,jumper,sizes",
pageSize: 10,
currentPage: 1,
total: this.referConfig.options.data?this.referConfig.options.data.length :0
@@ -90,13 +90,13 @@
this.getParams();
},
mounted() {
- if(this.referConfig.options.page){
- this.page.pageSize=this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
- this.page.currentPage=this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
- }else if(!validatenull(this.referConfig.options.limit)){
- this.page.pageSize=this.referConfig.options.limit
- }else if(!validatenull(this.referConfig.options.tableConfig.limit)){
- this.page.pageSize=this.referConfig.options.tableConfig.limit
+ if (this.referConfig.options.tableConfig && this.referConfig.options.tableConfig.page) {
+ this.page.pageSize = this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+ this.page.currentPage = this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
+ } else if (!validatenull(this.referConfig.options.limit)) {
+ this.page.pageSize = this.referConfig.options.limit;
+ } else if (this.referConfig.options.tableConfig && !validatenull(this.referConfig.options.tableConfig.limit)) {
+ this.page.pageSize = this.referConfig.options.tableConfig.limit;
}
this.$nextTick(() => {
this.$refs.referCrud.doLayout()
--
Gitblit v1.9.3