From b378b9b97a1119deeeab23f9f0c192426d01cee5 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 14 九月 2023 17:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index c093722..9e75512 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -1,11 +1,14 @@
<template>
<!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝鍏紡缂栬緫妗嗗脊绐� -->
<el-dialog
+ :close-on-click-modal="false"
title="鍙傜収閰嶇疆"
append-to-body
:visible.sync="isShowReferConfigForm"
width="90%"
id="refer-config-form"
+ top="0"
+ class= "avue-dialog avue-dialog--top"
destroy-on-close
@close="recoveryDataAndForm('initData')"
style="height: 115vh; margin-top: -14vh; overflow-y: hidden">
@@ -639,7 +642,7 @@
span: 6,
type: 'switch',
},{
- display: this.form.isPersistence | this.form.isPersistence=='true',
+ display: this.form.isPersistence || this.form.isPersistence=='true',
label: '鍙傜収閰嶇疆缂栧彿',
prop: 'id',
tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
@@ -650,7 +653,7 @@
}],
span: 6,
},{
- display: this.form.isPersistence | this.form.isPersistence=='true',
+ display: this.form.isPersistence || this.form.isPersistence=='true',
label: '鍙傜収閰嶇疆鍚嶇О',
prop: 'name',
tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
@@ -919,7 +922,7 @@
},
// 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
isShowReferConfigForm (){
- if(this.isShowReferConfigForm){
+ if(this.isShowReferConfigForm && this.codeShowFieldConfigVOS.length <= 0){
this.onloadAttrData();
}
}
@@ -982,6 +985,7 @@
// console.log(val.referConfig);
if(func.notEmpty(val.referConfig)){
this.form = JSON.parse(val.referConfig);
+ this.form.isPersistence = this.form.isPersistence == 'true'||this.form.isPersistence ? true:false;
// 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩笉鍙��
// this.referTypeIsReadOnly = true;
if((this.form.type == 'default' || this.form.type == 'grid') && (this.form.codeShowFieldConfigVOS != undefined && this.form.codeShowFieldConfigVOS.length > 0)){
@@ -1049,6 +1053,8 @@
return;
}
Object.assign(this.$data,this.$options.data());
+ //this.preClickAttrRow.$cellEdit = false;
+ //console.log(this.preClickAttrRow.$cellEdit);
// 绉婚櫎缁戝畾鍦ㄨ椤甸潰瀵硅瘽妗嗕笂鐨勫叏灞�鐩戝惉浜嬩欢
if(this.element != ''){
let te = window.removeEventListener('click', this.element)
@@ -1094,7 +1100,7 @@
];
}
// 寮�鍚寔涔呭寲鍙傜収閰嶇疆
- if(oldForm.isPersistence=='true' | oldForm.isPersistence){
+ if(oldForm.isPersistence=='true' || oldForm.isPersistence){
submittDefaultForm = submittDefaultForm.concat(['id','name'])
}
submittDefaultForm = submittDefaultForm.concat(addArray);
@@ -1230,7 +1236,6 @@
})
}
},
-
}
};
--
Gitblit v1.9.3