From b900796bc062f34908fedb9bfc74a3f840d06c73 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 01 十一月 2024 11:43:54 +0800
Subject: [PATCH] 修改bug
---
Source/plt-web/plt-web-ui/src/util/func.js | 6 +++---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 42 +++++++++++++++---------------------------
2 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/util/func.js b/Source/plt-web/plt-web-ui/src/util/func.js
index 9d26c8d..a423962 100644
--- a/Source/plt-web/plt-web-ui/src/util/func.js
+++ b/Source/plt-web/plt-web-ui/src/util/func.js
@@ -37,15 +37,15 @@
*/
static rowClickHandler(row, CrudRef, lastIndex, setLastIndex, setSelectList) {
- if (lastIndex === row.$index) {
+ /*if (lastIndex === row.$index) {
setSelectList();
CrudRef.clearSelection();
} else {
setSelectList();
CrudRef.clearSelection();
CrudRef.toggleRowSelection(row);
- }
-
+ }*/
+ CrudRef.toggleRowSelection(row);
setLastIndex(row.$index);
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
index 51f9ec7..2ab9bd1 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
@@ -232,7 +232,7 @@
<h3 style="border-bottom: 1px solid #eee;margin: -10px 0 20px;line-height: 40px">灞炴�ч」</h3>
<el-col :span="8">
<el-form-item label="鍚嶇О锛�" prop="id">
- <el-input v-model="form.id"></el-input>
+ <el-input v-model="form.id" :disabled="dialogTitle !== 'add'"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -263,8 +263,8 @@
<el-col :span="8">
<el-form-item v-if="form.enumSwitch" label="榛樿鍊硷細" prop="defaultValue">
<el-select v-model="form.defaultValue">
- <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
- :value="item"></el-option>
+ <el-option v-for="(item,index) in enumAddListChange" :key="index" :label="item.replace('=','')"
+ :value="item.replace('=','')"></el-option>
</el-select>
</el-form-item>
<el-form-item v-else label="榛樿鍊硷細" prop="defaultValue">
@@ -323,7 +323,7 @@
</el-col>
<el-col :span="24" v-if="form.rangeValue && form.rangeValue.length>0">
<el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
- <el-tag :key="item" v-for="item in rangeValueList" plain :closable="!form.enumSwitch" type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
+ <el-tag :key="item" v-for="item in form.rangeValue.split('\n')" plain :closable="!form.enumSwitch" type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
<el-input v-model="form.rangeValue" :readonly="form.enumSwitch" type="textarea" :rows="2" style="width: 0;height:0;overflow: hidden"></el-input>
</el-form-item>
</el-col>
@@ -335,8 +335,8 @@
<el-col :span="8">
<el-form-item v-if="form.enumSwitch" label="榛樿鍊硷細" prop="defaultValue">
<el-select v-model="form.defaultValue">
- <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
- :value="item"></el-option>
+ <el-option v-for="(item,index) in enumAddListChange" :key="index" :label="item.replace('=','')"
+ :value="item.replace('=','')"></el-option>
</el-select>
</el-form-item>
<el-form-item v-else label="榛樿鍊硷細" prop="defaultValue">
@@ -380,7 +380,7 @@
</el-col>
<el-col :span="24" v-if="form.rangeValue && form.rangeValue.length>0">
<el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
- <el-tag :key="item" v-for="item in rangeValueList" plain :closable="!form.enumSwitch" type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
+ <el-tag :key="item" v-for="item in form.rangeValue.split('\n')" plain :closable="!form.enumSwitch" type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
<el-input v-model="form.rangeValue" :readonly="form.enumSwitch" type="textarea" :rows="2" style="width: 0;height:0;overflow: hidden"></el-input>
</el-form-item>
</el-col>
@@ -401,8 +401,8 @@
<el-col :span="8">
<el-form-item v-if="form.enumSwitch" label="榛樿鍊硷細" prop="defaultValue">
<el-select v-model="form.defaultValue">
- <el-option v-for="(item,index) in rangeOptionValue" :key="index" :label="item"
- :value="item"></el-option>
+ <el-option v-for="(item,index) in enumAddListChange" :key="index" :label="item.replace('=','')"
+ :value="item.replace('=','')"></el-option>
</el-select>
</el-form-item>
<el-form-item v-else label="榛樿鍊硷細" prop="defaultValue">
@@ -435,7 +435,7 @@
</el-col>
<el-col :span="24" v-if="form.rangeValue && form.rangeValue.length>0">
<el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
- <el-tag :key="item" v-for="item in rangeValueList" plain closable type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
+ <el-tag :key="item" v-for="item in form.rangeValue.split('\n')" plain closable type="success" @close="handleRangeValueDel(item)" style="margin: 0 10px 5px 0">{{ item }}</el-tag>
<el-input v-model="form.rangeValue" type="textarea" :rows="2" style="width: 0;height:0;overflow: hidden"></el-input>
</el-form-item>
</el-col>
@@ -753,21 +753,6 @@
this.form.attributeDataType === 'VTClob' ||
this.form.attributeDataType === 'VTDateTime' ||
this.form.attributeDataType === 'VTFilePath';
- },
- rangeOptionValue() {
- let values = this.form.rangeValue.split('\n');
-
- // 澶勭悊姣忎釜鍊硷紝鍘婚櫎绛夊彿鍓嶇殑閮ㄥ垎锛屽彧淇濈暀绛夊彿鍚庣殑閮ㄥ垎
- return values.map(value => {
- let parts = value.split('=');
- return parts.length > 1 ? parts[1].trim() : value.trim();
- });
- },
- //琛ㄥ崟绉嶅綋鍓嶅�煎煙List
- rangeValueList(){
- if (this.form.rangeValue) {
- return this.form.rangeValue.split('\n');
- }
}
},
watch: {},
@@ -1006,7 +991,8 @@
enumSelectChange(val) {
const list = this.attributeDataTypePickList.find(item => item.key === val).values;
this.form.rangeValue = list.join('\n');
- this.form.defaultValue = this.rangeOptionValue[0];
+ this.enumAddListChange=list;
+ this.form.defaultValue = list[0].replace('=','');
},
// 浣跨敤鏋氫妇switch婊戝潡change浜嬩欢
@@ -1015,10 +1001,12 @@
this.form.enumId = this.attributeDataTypePickList[0].key;
const list = this.attributeDataTypePickList[0].values;
this.form.rangeValue = list.join('\n');
- this.form.defaultValue = this.rangeOptionValue[0];
+ this.enumAddListChange=list;
+ this.form.defaultValue = list[0].replace('=','');
} else {
this.form.defaultValue = "";
this.form.rangeValue = "";
+ this.enumAddListChange=[];
this.enumId = "";
}
},
--
Gitblit v1.9.3