From 035317b63479c6a1ce12f0e5c911d5d0e7a99e9b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 22:44:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/integration/integrationTransfer.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
index 4bd65f3..e070be9 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
@@ -81,15 +81,18 @@
pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
let name = this.props.label
let key = this.props.key
- let data = this.data.map(item => {
- let objitem = { disabled: false, ...item }
- if (this.disabledData.length !== 0) {
- this.disabledData.forEach(element => {
- if (objitem[name] === element) objitem.disabled = true
- });
- }
- return objitem
- })
+ if(this.data){
+ let data = this.data.map(item => {
+ let objitem = { disabled: false, ...item }
+ if (this.disabledData.length !== 0) {
+ this.disabledData.forEach(element => {
+ if (objitem[name] === element) objitem.disabled = true
+ });
+ }
+ return objitem
+ })
+ return
+ }
return data.map(item => {
let pinYin = pinyin.getFullChars(item[this.props.label])
let renPing = pinyin.getCamelChars(item[this.props.label])
--
Gitblit v1.9.3