From 8655012ffbd51a6550ffcc1882f6f5044cceac2e Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 04 十二月 2024 16:20:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java | 267 ++++++++++++++++++++++++++---------------------------
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 28 +++++
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 3
3 files changed, 159 insertions(+), 139 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
index 54713a2..2571ef3 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
@@ -18,120 +18,87 @@
*/
public class BaseModel implements java.io.Serializable{
-
/**
* 涓婚敭锛屽鏋滆嚜宸辩殑瀵硅薄锛屼笉鏄痮id浣滀负涓婚敭鐨勮瘽锛岄渶瑕佺敤id杩欎釜娉ㄨВ
*/
@Column(nullable = false)
private String oid;
-
- /**
- * 浠ｅ彿锛涘彲浠ヨ缃睘鎬х殑鏄犲皠锛宯ame琛ㄧず鍦ㄥ钩鍙扮殑涓氬姟绫诲瀷涓殑灞炴�у悕绉帮紝蹇呴』涓哄皬鍐欙紱
- */
- @Column()
- private String id;
-
- /**
- * 鍚嶇О锛涗篃鍙互涓嶈缃睘鎬ф槧灏勶紝榛樿鏄瓧娈靛悕鐨勫皬鍐�
- */
- @Column()
- private String name;
-
- /**
- * 鎻忚堪
- */
- @Column()
- private String description;
-
+
/**
* 鐗堟湰鐨勪富閿�
*/
@Column()
private String revisionOid;
-
+
/**
* 瀵硅薄鐨勪富閿�
*/
@Column()
private String nameOid;
-
+
/**
* 涓氬姟绫诲瀷鐨勫悕绉�
*/
@Column()
private String btmName;
-
+
/**
- * 鏄惁鏈�鍚庣増鏈�
+ * 鏄惁鏈�鍚庣増鏈��1锛氭槸锛�0锛氬惁
*/
@Column(length=1)
private String lastR;
-
-
+
+
/**
- * 鏄惁鏈�鍒濈増鏈�
+ * 鏄惁鏈�鍒濈増鏈��1锛氭槸锛�0锛氬惁
*/
@Column(length=1)
private String firstR;
-
-
+
+
/**
- * 鏄惁鏈�鏂扮増娆�
+ * 鏄惁鏈�鏂扮増娆°��1锛氭槸锛�0锛氬惁
*/
@Column(length=1)
private String lastV;
-
-
+
+
/**
- * 鏄惁鏈�鏃╃増娆�
+ * 鏄惁鏈�鏃╃増娆°��1锛氭槸锛�0锛氬惁
*/
@Column(length=1)
private String firstV;
-
+
/**
* 鍒涘缓浜�
*/
@Column(nullable = false)
private String creator;
-
+
/**
* 鍒涘缓鏃堕棿
*/
@Column(nullable = false)
@VciFieldType(VciFieldTypeEnum.VTDateTime)
private Date createTime;
-
+
/**
* 鏈�鍚庝慨鏀逛汉
*/
@Column(nullable = false)
private String lastModifier;
-
+
/**
* 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
@VciFieldType(VciFieldTypeEnum.VTDateTime)
private Date lastModifyTime;
-
+
/**
* 鐗堟湰瑙勫垯
*/
@Column()
private String revisionRule;
-
-
- /**
- * 鐗堟湰搴忓彿
- */
- @VciFieldType(VciFieldTypeEnum.VTInteger)
- private int revisionSeq;
-
- /**
- * 鐗堟湰鍊�
- */
- @Column()
- private String revisionValue;
-
/**
* 鐗堟瑙勫垯
@@ -140,11 +107,23 @@
private String versionRule;
/**
+ * 鐗堟湰搴忓彿
+ */
+ @VciFieldType(VciFieldTypeEnum.VTInteger)
+ private int revisionSeq;
+
+ /**
+ * 鐗堟湰鍊�
+ */
+ @Column()
+ private String revisionValue;
+
+ /**
* 鐗堟鎺掑簭
*/
@VciFieldType(VciFieldTypeEnum.VTInteger)
private int versionSeq;
-
+
/**
* 鐗堟鍊�
*/
@@ -162,54 +141,72 @@
*/
@Column()
private String lcStatus;
+
+ /**
+ * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
+ */
+ @JsonFormat(pattern = VciDateUtil.DateTimeMillFormat)
+ private Date ts;
+
+ /**
+ * 浠ｅ彿锛涘彲浠ヨ缃睘鎬х殑鏄犲皠锛宯ame琛ㄧず鍦ㄥ钩鍙扮殑涓氬姟绫诲瀷涓殑灞炴�у悕绉帮紝蹇呴』涓哄皬鍐欙紱
+ */
+ @Column()
+ private String id;
+
+ /**
+ * 鍚嶇О锛涗篃鍙互涓嶈缃睘鎬ф槧灏勶紝榛樿鏄瓧娈靛悕鐨勫皬鍐�
+ */
+ @Column()
+ private String name;
+
+ /**
+ * 鎻忚堪
+ */
+ @Column()
+ private String description;
+
+ /**
+ * 鎷ユ湁鑰咃紝涓庡垱寤鸿�呮湁鍖哄埆锛屽父鐢ㄤ簬鎺у埗鏁版嵁鏉冮檺
+ */
+ @Column(length = 50)
+ private String owner;
+
+ /**
+ * 绛惧叆浜�--绛惧叆鍜岀鍑烘暟鎹槸浜掓枼
+ */
+ @Column(length = 50)
+ private String checkInBy;
+
+ /**
+ * 绛惧叆鏃堕棿
+ */
+ @VciFieldType(VciFieldTypeEnum.VTDateTime)
+ private Date checkInTime;
+
+ /**
+ * 绛惧嚭浜�
+ */
+ @Column(length = 50)
+ private String checkOutBy;
+
+ /**
+ * 绛惧嚭鏃堕棿
+ */
+ @VciFieldType(VciFieldTypeEnum.VTDateTime)
+ private Date checkOutTime;
+
+ /**
+ * 浠庡摢涓増鏈嫹璐�
+ */
+ @Column(length = 50)
+ private String copyFromVersion;
/**
* 鐢熷懡鍛ㄦ湡鏄剧ず鏂囨湰
*/
@Transient(referColumn="lcStatus_text")
private String lcStatusText;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- @JsonFormat(pattern = VciDateUtil.DateTimeMillFormat)
- private Date ts;
-
- /**
- * 鎷ユ湁鑰咃紝涓庡垱寤鸿�呮湁鍖哄埆锛屽父鐢ㄤ簬鎺у埗鏁版嵁鏉冮檺
- */
- @Column(length = 50)
- private String owner;
-
- /**
- * 绛惧叆浜�--绛惧叆鍜岀鍑烘暟鎹槸浜掓枼
- */
- @Column(length = 50)
- private String checkInBy;
-
- /**
- * 绛惧叆鏃堕棿
- */
- @VciFieldType(VciFieldTypeEnum.VTDateTime)
- private Date checkInTime;
-
- /**
- * 绛惧嚭浜�
- */
- @Column(length = 50)
- private String checkOutBy;
-
- /**
- * 绛惧嚭鏃堕棿
- */
- @VciFieldType(VciFieldTypeEnum.VTDateTime)
- private Date checkOutTime;
-
- /**
- * 浠庡摢涓増鏈嫹璐�
- */
- @Column(length = 50)
- private String copyFromVersion;
/**
* 瀵嗙骇
@@ -235,30 +232,6 @@
public void setOid(String oid) {
this.oid = oid;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
}
public String getRevisionOid() {
@@ -357,6 +330,14 @@
this.revisionRule = revisionRule;
}
+ public String getVersionRule() {
+ return versionRule;
+ }
+
+ public void setVersionRule(String versionRule) {
+ this.versionRule = versionRule;
+ }
+
public int getRevisionSeq() {
return revisionSeq;
}
@@ -371,14 +352,6 @@
public void setRevisionValue(String revisionValue) {
this.revisionValue = revisionValue;
- }
-
- public String getVersionRule() {
- return versionRule;
- }
-
- public void setVersionRule(String versionRule) {
- this.versionRule = versionRule;
}
public int getVersionSeq() {
@@ -413,20 +386,36 @@
this.lcStatus = lcStatus;
}
- public String getLcStatusText() {
- return lcStatusText;
- }
-
- public void setLcStatusText(String lcStatusText) {
- this.lcStatusText = lcStatusText;
- }
-
public Date getTs() {
return ts;
}
public void setTs(Date ts) {
this.ts = ts;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
}
public String getOwner() {
@@ -477,6 +466,14 @@
this.copyFromVersion = copyFromVersion;
}
+ public String getLcStatusText() {
+ return lcStatusText;
+ }
+
+ public void setLcStatusText(String lcStatusText) {
+ this.lcStatusText = lcStatusText;
+ }
+
public Integer getSecretGrade() {
return secretGrade;
}
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 ffeb762..1c735fa 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
@@ -1065,7 +1065,6 @@
const types = ['radio', 'checkbox', 'select'];
return types.includes(this.form.itemType); // 灞曠ず
},
-
itemStyleTypeStatus() {
const types = ['hidden', 'webeditor', 'radio', 'checkbox'];
return !types.includes(this.form.itemType); // 涓嶅睍绀�
@@ -1315,7 +1314,7 @@
this.formList = this.formList.map(item => {
return {
...item,
- itemField: item.text // 灏唅temField璧嬪�间负text锛屽洜涓哄繕璁扮埗缁勪欢涓轰粈涔堝湪缂栬緫鍥炲～鏃舵妸itemField璧嬪�间负text浜�
+ itemField: item.text // 灏唅temField閲嶆柊璧嬪�间负text锛屽洜涓哄繕璁板綋鏃跺湪鐖剁粍浠剁紪杈戝洖濉柟娉曢噷涓轰粈涔堟妸itemField璧嬪�间负text浜�
};
});
const params = {
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 534aa18..b035270 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
@@ -288,9 +288,11 @@
name: "index",
data() {
return {
- queryTemplateNameList:[],
+ queryTemplateNameList: [],
templateIdList: [],
searchTargerChangeFlag: false,
+ showTypeChangeFlag: false,
+ linkTypeChangeFlag: false,
formBtnOid: '',
sourceBtnOid: '',
sourceOId: '',
@@ -603,6 +605,20 @@
this.queryTemplateNameList = res.data.data;
})
}
+ if (this.showTypeChangeFlag) {
+ if (val.value) {
+ if (this.form.searchTarger === '1') {
+ this.form.templateId = "";
+ this.form.queryTemplateName = "";
+ } else {
+ this.form.linkType = "";
+ this.form.templateId = "";
+ this.form.queryTemplateName = "";
+ }
+ }
+ } else {
+ this.showTypeChangeFlag = true;
+ }
},
props: {
label: 'name',
@@ -629,7 +645,7 @@
desc: 'tag'
},
dicUrl: '/api/uiManagerController/getLinkDatasByPage?page=1&limit=-1&conditionMap[selectBtmType]={{key}}',
- change:(val) => {
+ change: (val) => {
if (val.value) {
let params = {
'conditionMap[selectBtmType]': val.value
@@ -641,6 +657,14 @@
this.queryTemplateNameList = res.data.data;
})
}
+ if (this.linkTypeChangeFlag) {
+ if (val.value) {
+ this.form.templateId = "";
+ this.form.queryTemplateName = "";
+ }
+ } else {
+ this.linkTypeChangeFlag = true;
+ }
}
},
{
--
Gitblit v1.9.3