From 22537c899356e43cbae8c52d1ac4d80cb3b52ae0 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 10 十二月 2024 18:09:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 4 +
Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue | 7 +-
Source/plt-web/plt-web-ui/src/components/actions/base/uploadFile.vue | 6 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 1
Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue | 33 +++++++----
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java | 33 +++++++++++
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java | 56 ++++++------------
Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue | 2
8 files changed, 84 insertions(+), 58 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java
index 5f8f765..af95a71 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/wrapper/VciQueryWrapperForDO.java
@@ -175,6 +175,39 @@
}};
/**
+ * BaseModel鍜孊usinessObject涓殑灞炴�ф槧灏勩��
+ * key锛氫负BaseModel涓殑灞炴�э紝value锛氫负BusinessObject涓殑灞炴��
+ */
+ public static final Map<String, String> BASEMODEL_CBO_FIELD_MAP = new HashMap(){{
+ put("oid", "oid");
+ put("revisionoid","revoid");
+ put("nameoid","nameoid");
+ put("btmname","btname");
+ put("lastr","islastr");
+ put("firstr","isfirstr");
+ put("lastv","islastv");
+ put("firstv","isfirstv");
+ put("creator","creator");
+ put("createtime","createtime");
+ put("lastmodifier","modifier");
+ put("lastmodifytime","modifytime");
+ put("revisionrule","revisionrule");
+ put("versionrule","versionrule");
+ put("revisionseq","revisionseq");
+ put("revisionvalue","revisionvalue");
+ put("versionseq","versionseq");
+ put("versionvalue","versionvalue");
+ put("lctid","lctid");
+ put("lcstatus","lcstatus");
+ put("ts","ts");
+ put("id","id");
+ put("name","name");
+ put("description","description");
+ put("owner","owner");
+ put("copyfromversion","fromversion");
+ }};
+
+ /**
* 涓婚敭灞炴��
*/
public static final String OID_FIELD = "oid";
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
index c0f557d..e1037a1 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
@@ -624,7 +624,7 @@
}
}
//濡傛灉鐗堟湰鏈搴忓彿鐨勫睘鎬э紝闇�瑕佷粠灞炴�х殑鏄犲皠涓紝鑾峰彇涓氬姟绫诲瀷涓殑瀛楁鍚嶇О
- clientBoAttrName = VciQueryWrapperForDO.BASE_MODEL_COMPATIBILITY_MAP.getOrDefault(clientBoAttrName.toLowerCase(Locale.ROOT),clientBoAttrName);
+ clientBoAttrName = VciQueryWrapperForDO.BASEMODEL_CBO_FIELD_MAP.getOrDefault(clientBoAttrName.toLowerCase(Locale.ROOT),clientBoAttrName);
return clientBoAttrName;
}
@@ -750,12 +750,12 @@
* @return 鏂规硶
*/
public static Method getSetmethod(Class c,String fieldName){
- if(c!=null&&isNotNull(fieldName)){
+ if(c != null && isNotNull(fieldName)){
try {
PropertyDescriptor pd = new PropertyDescriptor(fieldName, c);
return pd.getWriteMethod();
- } catch (SecurityException e) {
- } catch (IntrospectionException e) {
+ } catch (Exception e) {
+ //TODO 涓嶅仛澶勭悊
}
}
return null;
@@ -815,6 +815,7 @@
* @param value 灞炴�у��
*/
public static void setValueForFieldFromCbo(String fieldName,Object obj,String value){
+ System.out.println("fieldName锛�"+fieldName+"锛寁alue锛�"+value);
try{
Field field = getFieldForObject(fieldName,obj);
if(field != null){
@@ -1164,38 +1165,18 @@
List<Field> boFields = getAllFieldForObj(bo.getClass());
if(!CollectionUtils.isEmpty(boFields)){
for(Field field : boFields){
- //璇存槑杩欎釜灏辨槸鍦˙O瀵硅薄涓婄殑
- Object value = getValueFromField(field.getName(), bo);
- if(value != null){
- //BusinessObject鍜孊aseModel涓紝浠ヤ笅鐨勫睘鎬э紝涓嶇浉鍚岋紝闇�瑕佸崟鐙鐞�
- switch (field.getName().toLowerCase()){
- case "revoid":
- setValueForFieldFromCbo("revisionOid", obj, getStringValueFromObject(value));
- break;
- case "btname":
- setValueForFieldFromCbo("btmName", obj, getStringValueFromObject(value));
- break;
- case "islastr":
- setValueForFieldFromCbo("lastr", obj, getStringValueFromObject(value).equalsIgnoreCase("true")?"1":"0");
- break;
- case "isfirstr":
- setValueForFieldFromCbo("firstr", obj, getStringValueFromObject(value).equalsIgnoreCase("true")?"1":"0");
- break;
- case "islastv":
- setValueForFieldFromCbo("lastv", obj, getStringValueFromObject(value).equalsIgnoreCase("true")?"1":"0");
- break;
- case "isfirstv":
- setValueForFieldFromCbo("firstv", obj, getStringValueFromObject(value).equalsIgnoreCase("true")?"1":"0");
- break;
- case "modifytime":
- setValueForFieldFromCbo("lastmodifytime", obj, getStringValueFromObject(value));
- break;
- case "fromversion":
- setValueForFieldFromCbo("copyFromVersion", obj, getStringValueFromObject(value));
- break;
- default:
- setValueForFieldFromCbo(fieldAttrMap.get(field.getName().toLowerCase()), obj, getStringValueFromObject(value));
- break;
+ if(VciQueryWrapperForDO.BASEMODEL_CBO_FIELD_MAP.containsValue(field.getName().toLowerCase())){
+ //璇存槑杩欎釜灏辨槸鍦˙O瀵硅薄涓婄殑
+ Object value = getValueFromField(field.getName(), bo);
+ if(value != null){
+ //BusinessObject鍜孊aseModel涓紝鏄惁绗竴鐗堟湰鐗堟鐨勫睘鎬э紝闇�瑕佸崟鐙鐞�
+ String fieldValue;
+ if(VciQueryWrapperForDO.BASE_MODEL_COMPATIBILITY_MAP.containsValue(field.getName().toLowerCase())){
+ fieldValue = getStringValueFromObject(value).equalsIgnoreCase("true")?"1":"0";
+ }else{
+ fieldValue = getStringValueFromObject(value);
+ }
+ setValueForFieldFromCbo(fieldAttrMap.get(field.getName().toLowerCase()), obj, fieldValue);
}
}
}
@@ -1579,8 +1560,7 @@
* @return true涓洪粯璁�
*/
public static boolean isDefaultField(String fieldNames){
- if(VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(fieldNames) || VciQueryWrapperForDO.LIFECYCLE_MANAGE_FIELD_MAP.containsKey(fieldNames)
- || VciQueryWrapperForDO.REVISION_MANAGE_FIELD_MAP.containsKey(fieldNames) || VciQueryWrapperForDO.BASE_MODEL_COMPATIBILITY_MAP.containsValue(fieldNames)) {
+ if(VciQueryWrapperForDO.BASEMODEL_CBO_FIELD_MAP.containsKey(fieldNames)) {
return true;
}
return false;
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/uploadFile.vue b/Source/plt-web/plt-web-ui/src/components/actions/base/uploadFile.vue
index 6a10a70..bb493fa 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/uploadFile.vue
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/uploadFile.vue
@@ -119,10 +119,10 @@
// 鑾峰彇鏂囦欢鎵╁睍鍚�
const fileExtension = file.name.split(".").pop().toLowerCase(); // 杞崲涓哄皬鍐欎互閬垮厤澶у皬鍐欎笉鍖归厤鐨勯棶棰�
- if(this.paramVOS.fileType){
- if (!this.paramVOS.fileType.includes(fileExtension)) {
+ if(this.paramVOS.filetype){
+ if (!this.paramVOS.filetype.includes(fileExtension)) {
// 涓婁紶鏍煎紡涓嶇鍚堣姹傦紝鎻愮ず閿欒淇℃伅骞跺彇娑堜笂浼�
- this.$message.error(`鍙厑璁镐笂浼�${this.paramVOS.fileType.toString()}鏍煎紡鐨勬枃浠禶);
+ this.$message.error(`鍙厑璁镐笂浼�${this.paramVOS.filetype.toString()}鏍煎紡鐨勬枃浠禶);
return Promise.reject(false);
}
}
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue
index b78c6e4..9e88315 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue
@@ -158,7 +158,7 @@
const canvas = document.createElement('canvas')
const canvasContext = canvas.getContext('2d')
canvasContext.font = this.fontSize + 'px System'
- let label = model.label.replace('\n', '')
+ let label = model.label ? model.label.replace('\n', '') : '';
let sourceWidth = this.formModel.width
let sourceHeight = this.formModel.height
const spacing = 10
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue
index 4a616a4..849260d 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue
@@ -8,7 +8,7 @@
label-width="80px"
size="mini"
>
- <el-form-item label="鍚嶇О" prop="id">
+ <el-form-item label="妯℃澘鍚嶇О" prop="id">
<el-input v-model.trim="newRowData.id" :disabled="!disabledBtn" :maxLength="20" clearable/>
</el-form-item>
<el-form-item label="鏍囩" prop="name">
@@ -108,9 +108,9 @@
saveEventList: []
},
rules: {
- name: [{required: true, message: "鍚嶇О涓嶈兘涓虹┖", trigger: "blur"}],
+ name: [{required: true, message: "鏍囩涓嶈兘涓虹┖", trigger: "blur"}],
id: [
- {required: true, message: "鏍囩涓嶈兘涓虹┖", trigger: "blur"},
+ {required: true, message: "鍚嶇О涓嶈兘涓虹┖", trigger: "blur"},
{
pattern: /^[A-z]+$/g,
message: "鏍囩鍙兘杈撳叆鑻辨枃",
@@ -185,7 +185,6 @@
color: #409eff;
background-color: #ecf5ff;
}
-
}
.event {
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue
index 7a76262..e7a92e8 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue
@@ -1,29 +1,32 @@
<template>
<div class="item_panel_box">
- <el-input size="mini" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
+ <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" size="mini">
</el-input>
<div class="box_item">
- <item-panel class="item-panel" v-loading="loading">
+ <item-panel v-loading="loading" class="item-panel">
<template v-for="(item, index) in nodeItems">
<item
:key="index"
- :type="item.type || 'node'"
- :size="item.size || '72*43'"
- :shape="item.shape || 'flow-rect'"
:model="{
// must have model property
color: item.color || '#1890FF',
label: item.id || '鑺傜偣'
}"
+ :shape="item.shape || 'flow-rect'"
+ :size="item.size || '72*43'"
+ :type="item.type || 'node'"
>
<template v-if="item.src">
<div class="item item-img">
- <img :src="item.src" :alt="item.id" />
+ <img :alt="item.id" :src="item.src"/>
</div>
</template>
<template v-else>
<div :class="'item item-' + (item.shape || 'flow-rect')">
- <span>{{ item.id }}</span>
+ <el-tooltip v-if="item.id.length > 9" :content="item.id" effect="light" placement="top">
+ <span class="spanValue">{{ item.id }}</span>
+ </el-tooltip>
+ <span v-else>{{ item.id }}</span>
</div>
</template>
</item>
@@ -34,16 +37,16 @@
</template>
<script>
-import { Item, ItemPanel } from 'vue-flowchart-editor'
+import {Item, ItemPanel} from 'vue-flowchart-editor'
// import { getPage } from '../../../api/omd/status'
export default {
name: 'EditorItemPanel',
- components: { ItemPanel, Item },
+ components: {ItemPanel, Item},
props: {
- nodeItems:{
- type:Array,
- default:() => [],
+ nodeItems: {
+ type: Array,
+ default: () => [],
}
},
data() {
@@ -118,4 +121,10 @@
.item-img {
max-width: 100px;
}
+
+.spanValue {
+ white-space: nowrap; // 闃叉鎹㈣
+ overflow: hidden; //闅愯棌瓒呭嚭閮ㄥ垎
+ text-overflow: ellipsis; //鏄剧ず鐪佺暐鍙�
+}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
index f67bc3d..02ed624 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
@@ -1026,6 +1026,7 @@
],
form: {},
topForm: {
+ itemQtName:'',
columnNumber: 8,
showColumn: '3',
viName: '',
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index c1df775..8f4a109 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -604,6 +604,7 @@
dicUrl: '/api/uiManagerController/getBtmDatasByPage?page=1&limit=-1',
filterable: true,
change: (val) => {
+ console.log('showTypeChangeFlag',this.showTypeChangeFlag)
if (val.value) {
let params = {
'conditionMap[selectBtmType]': this.form.searchTarger === '1' ? this.form.showType : this.form.linkType
@@ -916,6 +917,8 @@
// 澧炲姞鍏抽棴瀵硅瘽妗� 娓呯┖event鏁扮粍
beforeClose(done) {
this.eventData = [];
+ this.showTypeChangeFlag = false;
+ this.linkTypeChangeFlag = false;
done();
},
@@ -935,6 +938,7 @@
};
});
}
+ console.log('row',row);
this.searchTargerChangeFlag = false;
this.$refs.crud.rowEdit(row);
},
--
Gitblit v1.9.3