From 63920d1bb92934520a38993d00c6768e2cefd19c Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期二, 24 十二月 2024 18:02:22 +0800
Subject: [PATCH] 业务类型一致性检查未知&&默认折叠菜单&&生命周期按钮
---
Source/plt-web/plt-web-ui/src/store/modules/common.js | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 236 +++++++++++++++++++++++++++++++++--------------------------
3 files changed, 134 insertions(+), 106 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/store/modules/common.js b/Source/plt-web/plt-web-ui/src/store/modules/common.js
index d6fdc9b..5c36427 100644
--- a/Source/plt-web/plt-web-ui/src/store/modules/common.js
+++ b/Source/plt-web/plt-web-ui/src/store/modules/common.js
@@ -10,7 +10,7 @@
state: {
language: getStore({name: 'language'}) || 'zh',
- isCollapse: false,
+ isCollapse: true,
isFullScren: false,
isMenu: true,
isShade: false,
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index edef882..048eb04 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -21,23 +21,46 @@
<el-main>
<basic-container>
<div>
- <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓</el-button>
- <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary" @click="editClickHandler">淇敼</el-button>
- <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger" @click="deleteClickHandler">鍒犻櫎</el-button>
- <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆</el-button>
- <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" @click="exportClickHandler">瀵煎嚭</el-button>
- <el-button v-if="permissionList.createViewBtn" icon="el-icon-circle-plus-outline" plain size="small" type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘</el-button>
- <el-button v-if="permissionList.createIndexBtn" icon="el-icon-circle-plus-outline" plain size="small" type="primary" @click="indexClickHandler">鍒涘缓绱㈠紩</el-button>
- <el-button v-if="permissionList.consistencyCheckBtn" icon="el-icon-menu" plain size="small" type="primary" @click="checkClickHandler">涓�鑷存�ф鏌�</el-button>
- <el-button v-if="permissionList.deleteDataBtn" icon="el-icon-delete" plain size="small" type="danger" @click="checkClickHandler">鍒犻櫎鏁版嵁</el-button>
- <el-button v-if="permissionList.deleteEveryTypeBtn" icon="el-icon-delete" plain size="small" type="danger" @click="checkClickHandler">鍒犻櫎鍏ㄩ儴绫诲瀷</el-button>
- <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿</el-button>
+ <el-button v-if="permissionList.addBtn" icon="el-icon-plus" plain size="small" type="primary"
+ @click="addClickHandler">鍒涘缓
+ </el-button>
+ <el-button v-if="permissionList.editBtn" icon="el-icon-edit" plain size="small" type="primary"
+ @click="editClickHandler">淇敼
+ </el-button>
+ <el-button v-if="permissionList.delBtn" icon="el-icon-delete" plain size="small" type="danger"
+ @click="deleteClickHandler">鍒犻櫎
+ </el-button>
+ <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary"
+ @click="upLoadClickHandler">瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary"
+ @click="exportClickHandler">瀵煎嚭
+ </el-button>
+ <el-button v-if="permissionList.createViewBtn" icon="el-icon-circle-plus-outline" plain size="small"
+ type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘
+ </el-button>
+ <el-button v-if="permissionList.createIndexBtn" icon="el-icon-circle-plus-outline" plain size="small"
+ type="primary" @click="indexClickHandler">鍒涘缓绱㈠紩
+ </el-button>
+ <el-button v-if="permissionList.consistencyCheckBtn" icon="el-icon-menu" plain size="small" type="primary"
+ @click="checkClickHandler">涓�鑷存�ф鏌�
+ </el-button>
+ <el-button v-if="permissionList.deleteDataBtn" icon="el-icon-delete" plain size="small" type="danger"
+ @click="checkClickHandler">鍒犻櫎鏁版嵁
+ </el-button>
+ <el-button v-if="permissionList.deleteEveryTypeBtn" icon="el-icon-delete" plain size="small" type="danger"
+ @click="checkClickHandler">鍒犻櫎鍏ㄩ儴绫诲瀷
+ </el-button>
+ <el-button v-if="permissionList.viewTheScopeBtn" icon="el-icon-view" plain size="small" type="primary"
+ @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ </el-button>
</div>
<div style="display: flex;justify-content:left;margin-top: 15px;">
<div class="descBox" style="width: 40%">
<el-descriptions :column="2" border class="margin-top" size="medium" title="灞炴�т俊鎭�">
- <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
- :labelStyle="descriptionOption.labelStyle">
+ <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
+ :labelStyle="descriptionOption.labelStyle"
+ :span="12">
<template slot="label">
鍚嶇О
</template>
@@ -50,7 +73,7 @@
</template>
<el-tag v-if="nodeRow.name">{{ nodeRow.name }}</el-tag>
</el-descriptions-item>
- <el-descriptions-item :contentStyle="descriptionOption.contentStyle+';min-width: 100px;'"
+ <el-descriptions-item :contentStyle="descriptionOption.contentStyle+';min-width: 100px;'"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
鍥炬爣
@@ -59,8 +82,9 @@
<icon-show :name="nodeRow.imageName"></icon-show>
</span>
</el-descriptions-item>
- <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
- :labelStyle="descriptionOption.labelStyle">
+ <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
+ :labelStyle="descriptionOption.labelStyle"
+ :span="12">
<template slot="label">
瀹炵幇绫�
</template>
@@ -69,8 +93,9 @@
<el-tag style="max-width: 100%;overflow: hidden;display: block">{{ nodeRow.implClass }}</el-tag>
</el-tooltip>
</el-descriptions-item>
- <el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
- :labelStyle="descriptionOption.labelStyle">
+ <el-descriptions-item :contentStyle="descriptionOption.contentStyle"
+ :labelStyle="descriptionOption.labelStyle"
+ :span="12">
<template slot="label">
鎻忚堪
</template>
@@ -190,11 +215,11 @@
</el-col>
</el-row>
<el-form-item label="缁ф壙鑷細" prop="fName">
- <avue-input-tree :disabled="title === 'add'"
- v-model="form.fName"
- placeholder="璇烽�夋嫨涓氬姟绫诲瀷"
+ <avue-input-tree v-model="form.fName"
+ :dic="inheritTreeData"
+ :disabled="title === 'add'"
:props="{label: 'id', value: 'id',children: 'children'}"
- :dic="inheritTreeData"></avue-input-tree>
+ placeholder="璇烽�夋嫨涓氬姟绫诲瀷"></avue-input-tree>
</el-form-item>
<el-form-item label="瀹炵幇绫伙細" prop="implClass">
<el-input v-model="form.implClass"></el-input>
@@ -205,17 +230,20 @@
</div>
<div class="centerForm" style="width: 26%">
<el-form-item label="鐗堟湰瑙勫垯锛�" label-width="100px" prop="revLevel" style="margin-bottom: 10px;">
- <el-radio v-model="form.revLevel" label="0" @input="revLevelChange">涓嶅彲淇</el-radio><br>
- <el-radio v-model="form.revLevel" label="1" @input="revLevelChange">閲囩敤涓�绾х増鏈鐞�</el-radio><br>
+ <el-radio v-model="form.revLevel" label="0" @input="revLevelChange">涓嶅彲淇</el-radio>
+ <br>
+ <el-radio v-model="form.revLevel" label="1" @input="revLevelChange">閲囩敤涓�绾х増鏈鐞�</el-radio>
+ <br>
<el-radio v-model="form.revLevel" label="2" @input="revLevelChange">閲囩敤浜岀骇鐗堟湰绠＄悊</el-radio>
</el-form-item>
- <el-form-item v-if="form.revLevel !== '0'" label="鐗堟湰鍙疯鍒欙細" label-width="100px" prop="revisionRuleId" style="margin-bottom: 5px;">
+ <el-form-item v-if="form.revLevel !== '0'" label="鐗堟湰鍙疯鍒欙細" label-width="100px" prop="revisionRuleId"
+ style="margin-bottom: 5px;">
<avue-select v-model="form.revisionRuleId"
+ :dic="versionData"
:disabled="form.inputRevisionFlag"
- placeholder="璇烽�夋嫨鐗堟湰鍙疯鍒�"
:filterable="true"
:props="{label: 'id', value: 'id'}"
- :dic="versionData"></avue-select>
+ placeholder="璇烽�夋嫨鐗堟湰鍙疯鍒�"></avue-select>
<el-switch
v-model="form.inputRevisionFlag"
active-text="鎵嬪伐杈撳叆"
@@ -223,7 +251,8 @@
@change="form.revisionRuleId = ''">
</el-switch>
</el-form-item>
- <el-form-item v-if="form.revLevel !== '0'" label="鍒嗛殧绗︼細" label-width="100px" prop="delimiter" style="margin-bottom: 5px;">
+ <el-form-item v-if="form.revLevel !== '0'" label="鍒嗛殧绗︼細" label-width="100px" prop="delimiter"
+ style="margin-bottom: 5px;">
<el-radio v-model="form.delimiter" label=""> </el-radio>
<el-radio v-model="form.delimiter" label=".">.</el-radio>
<el-radio v-model="form.delimiter" label="-">-</el-radio>
@@ -238,19 +267,19 @@
<div class="rightForm" style="width: 25%">
<el-form-item label="鐢熷懡鍛ㄦ湡锛�" label-width="138px" prop="lifeCycleId">
<avue-select v-model="form.lifeCycleId"
- placeholder="璇烽�夋嫨鐢熷懡鍛ㄦ湡"
+ :dic="lifeData"
:filterable="true"
:props="{label: 'id', value: 'id'}"
- :dic="lifeData"></avue-select>
+ placeholder="璇烽�夋嫨鐢熷懡鍛ㄦ湡"></avue-select>
</el-form-item>
<el-form-item label="澶囬�夌敓鍛藉懆鏈熷垪琛細" label-width="138px" prop="subLifeCycleIdList">
- <avue-select multiple
- :filterable="true"
- v-model="form.subLifeCycleIdList"
- placeholder="璇烽�夋嫨鐢熷懡鍛ㄦ湡"
- :props="{label: 'id', value: 'id'}"
- type="tree"
+ <avue-select v-model="form.subLifeCycleIdList"
:dic="subLifeData"
+ :filterable="true"
+ :props="{label: 'id', value: 'id'}"
+ multiple
+ placeholder="璇烽�夋嫨鐢熷懡鍛ㄦ湡"
+ type="tree"
@change="subLifeChange"></avue-select>
</el-form-item>
</div>
@@ -258,9 +287,9 @@
</el-form>
<div class="bottomForm">
<avue-crud
- size="mini"
:data="dialogAttrData"
:option="dialogAttrOption"
+ size="mini"
@row-del="dialogBottomAttrDel">
<template slot="menuLeft">
<h3 style="display: inline-block;margin-right: 20px;margin-bottom: 10px;">灞炴�ф睜鍒楄〃</h3>
@@ -526,11 +555,12 @@
index: false,
selection: false,
refreshBtn: false,
- header:false,
+ header: false,
column: [
{
label: '绫诲瀷鍚�',
prop: 'id',
+ width: 250,
},
{
label: '鎿嶄綔',
@@ -539,6 +569,7 @@
{
label: '鐘舵��',
prop: 'status',
+ width: 250,
}
]
},
@@ -555,7 +586,7 @@
searchMenuSpan: 8,
refreshBtn: false,
selection: false,
- header:false,
+ header: false,
column: [
{
label: '鍚嶇О',
@@ -585,8 +616,8 @@
versionAddFlag: false,
inheritTreeData: [],
lifeData: [],//鐢熷懡鍛ㄦ湡涓嬫媺鏁版嵁
- subLifeData:[],//澶囬�夌敓鍛藉懆鏈熶笅鎷夋暟鎹�
- allLifeData:[],
+ subLifeData: [],//澶囬�夌敓鍛藉懆鏈熶笅鎷夋暟鎹�
+ allLifeData: [],
versionData: [],//鐗堟湰瑙勫垯鏁版嵁
dialogAttrSelectList: [],
searchAttrParams: {},
@@ -608,7 +639,7 @@
height: 450,
searchMenuSpan: 8,
header: false,
- selectable:function(row){
+ selectable: function (row) {
return row.selectable;
},
column: [
@@ -617,13 +648,13 @@
prop: 'id',
sortable: true,
search: true,
- width:260
+ width: 260
},
{
label: '灞炴�х被鍨�',
prop: 'attributeDataType',
sortable: true,
- width:150,
+ width: 150,
},
{
label: '鍒濆鍊�',
@@ -646,7 +677,7 @@
{required: true, message: '璇疯緭绫诲瀷鍚嶇О', trigger: 'blur'},
{validator: this.validateEnglishOnly, trigger: 'blur'}
],
- imageName:[
+ imageName: [
{required: true, message: '璇烽�夋嫨鍥炬爣', trigger: 'submit'},
],
revLevel: [
@@ -664,16 +695,16 @@
selection: false,
height: 220,
addBtn: false,
- gridBtn:false,
- columnBtn:false,
- menuWidth:100,
+ gridBtn: false,
+ columnBtn: false,
+ menuWidth: 100,
// index:false,
column: [
{
label: '灞炴�у悕',
prop: 'id',
sortable: true,
- width:260,
+ width: 260,
},
{
@@ -686,13 +717,13 @@
label: '灞炴�х被鍨�',
prop: 'attributeDataType',
sortable: true,
- width:150,
+ width: 150,
},
{
label: '鍒濆鍊�',
prop: 'defaultValue',
sortable: true,
- width:200,
+ width: 200,
},
{
label: '璇存槑',
@@ -717,19 +748,19 @@
prop: 'id',
label: '灞炴�у悕',
sortable: true,
- width:260
+ width: 260
},
{
prop: 'btmTypeId',
label: '涓氬姟绫诲瀷',
sortable: true,
- width:200
+ width: 200
},
{
prop: 'attributeDataType',
label: '灞炴�х被鍨�',
sortable: true,
- width:150
+ width: 150
},
{
prop: 'defaultValue',
@@ -757,7 +788,7 @@
versionRule: '0', // 鐗堟鍙疯鍒�
lifeCycleId: '', // 鐢熷懡鍛ㄦ湡
subLifeCycleId: '', // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�,
- subLifeCycleIdList:[],
+ subLifeCycleIdList: [],
apNameArray: "", // 灞炴�ф睜鍒楄〃鈥欙紝鈥樺垎闅�
},
nodeRow: {},
@@ -797,7 +828,7 @@
this.getVersionList();
this.getLifeCycle();
},
- computed:{
+ computed: {
...mapGetters(["permission"]),
permissionList() {
return {
@@ -815,14 +846,14 @@
};
},
},
- watch:{
- 'form.lifeCycleId':{
+ watch: {
+ 'form.lifeCycleId': {
handler(newval) {
- if(this.form.lifeCycleId){
- this.subLifeData = this.allLifeData.filter(item=>{
- return item.id!=this.form.lifeCycleId
+ if (this.form.lifeCycleId) {
+ this.subLifeData = this.allLifeData.filter(item => {
+ return item.id != this.form.lifeCycleId
});
- }else {
+ } else {
this.subLifeData = this.allLifeData
}
},
@@ -861,15 +892,15 @@
this.nodeRow = row;
},
//鑾峰彇鐗堟湰瑙勫垯鏁版嵁
- getVersionList(){
+ getVersionList() {
getVersionRuleAllList().then(res => {
this.versionData = res.data.data;
});
},
//鑾峰彇鐢熷懡鍛ㄦ湡鏁版嵁
- getLifeCycle(){
+ getLifeCycle() {
gridLifeCycle().then(res => {
- this.allLifeData=res.data.data;
+ this.allLifeData = res.data.data;
});
},
// 鍒涘缓鎸夐挳
@@ -888,12 +919,12 @@
// 鏂板缂栬緫淇濆瓨
addDialogSavaHandler() {
- if (this.form.revLevel !== '0' &&!this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
+ if (this.form.revLevel !== '0' && !this.form.inputRevisionFlag && (!this.form.revisionRuleId || this.form.revisionRuleId === "")) {
this.$message.error('璇锋鏌ョ増鏈彿瑙勫垯涓嶈兘涓虹┖');
return;
}
- this.form.lifeCycleIds=this.form.subLifeCycleIdList.join(',');
- this.form.subLifeCycleId=this.form.subLifeCycleIdList.join(',');
+ this.form.lifeCycleIds = this.form.subLifeCycleIdList.join(',');
+ this.form.subLifeCycleId = this.form.subLifeCycleIdList.join(',');
this.form.apNameArray = this.dialogAttrData ? this.dialogAttrData.map(item => item.id).join(',') : "";
this.$refs.form.validate((valid) => {
const saveFunction = this.title === 'add' ? addLifeCycle : updateLifeCycle;
@@ -943,36 +974,37 @@
this.form = {...this.nodeRow};
this.form.inputRevisionFlag = JSON.parse(this.form.inputRevisionFlag); // 瀛楃涓瞗alse杞崲涓哄竷灏斿��
// this.form.fName = this.nodeRow.id === 'topNode' ? "" : this.nodeRow.id;
- this.form.subLifeCycleIdList = this.nodeRow.lifeCycleIds?this.nodeRow.lifeCycleIds.split(','):[];
+ this.form.subLifeCycleIdList = this.nodeRow.lifeCycleIds ? this.nodeRow.lifeCycleIds.split(',') : [];
this.dialogAttrData = this.nodeRow.attributes ? JSON.parse(this.nodeRow.attributes) : [];
- function processChildren(item,fName) {
+
+ function processChildren(item, fName) {
if (item.children && item.children.length > 0) {
item.children = item.children.map(child => {
- processChildren(child,fName); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
- if(fName==child.id){
- child.disabled=true;
- }else {
- child.disabled=false;
+ processChildren(child, fName); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�
+ if (fName == child.id) {
+ child.disabled = true;
+ } else {
+ child.disabled = false;
}
return child;
});
}
};
- const inheritTreeData=this.inheritTreeData.map(item => {
- processChildren(item,this.form.id); // 澶勭悊姣忎釜鑺傜偣
- if(this.form.id==item.id){
- item.disabled=true;
- }else {
- item.disabled=false;
+ const inheritTreeData = this.inheritTreeData.map(item => {
+ processChildren(item, this.form.id); // 澶勭悊姣忎釜鑺傜偣
+ if (this.form.id == item.id) {
+ item.disabled = true;
+ } else {
+ item.disabled = false;
}
return item;
});
- this.inheritTreeData=inheritTreeData
+ this.inheritTreeData = inheritTreeData
this.title = 'edit';
this.visible = true;
},
- subLifeChange(data){
+ subLifeChange(data) {
if (data.value.length == 0) {
this.lifeData = this.allLifeData
} else {
@@ -992,11 +1024,11 @@
// 鏌ヨ灞炴�ф睜鍒楄〃鏁版嵁
getAttrDialogDta() {
gridAttribute(this.attrPage.currentPage, this.attrPage.pageSize, this.searchAttrParams).then(res => {
- const data = res.data.data.map(item=>{
- item.selectable=!this.dialogAttrData.some(existingItem => existingItem.id === item.id);
+ const data = res.data.data.map(item => {
+ item.selectable = !this.dialogAttrData.some(existingItem => existingItem.id === item.id);
return item;
});
- this.dialogAttrSaveData=data;
+ this.dialogAttrSaveData = data;
this.attrPage.total = res.data.total;
this.dialogAttrLoading = false;
}).catch(err => {
@@ -1017,7 +1049,7 @@
// 娣诲姞灞炴�ф睜 琛岀偣鍑�
dialogAttrRowClickHandler(row) {
- if(!row.selectable){
+ if (!row.selectable) {
return;
}
func.rowClickHandler(
@@ -1109,8 +1141,8 @@
versionRule: '0', // 鐗堟鍙疯鍒�
lifeCycleId: '', // 鐢熷懡鍛ㄦ湡
subLifeCycleId: '', // 鐢熷懡鍛ㄦ湡澶囬�夊垪琛�,
- subLifeCycleIdList:[],
- lifeCycleIds:'',
+ subLifeCycleIdList: [],
+ lifeCycleIds: '',
apNameArray: "", // 灞炴�ф睜鍒楄〃鈥欙紝鈥樺垎闅�
};
this.dialogAttrData = []; // 灏嗗睘鎬ф睜琛ㄦ牸缃┖
@@ -1252,18 +1284,14 @@
Object.entries(data).forEach(([id, methods]) => {
let action;
- switch (methods) {
- case '_CREATE':
- action = '鍒涘缓琛�';
- break;
- case '_ADD':
- action = '澧炲姞鍒�';
- break;
- case '_DROP':
- action = '绉婚櫎鍒�';
- break;
- default:
- action = '鏈煡';
+ if (methods.includes('_CREATE')) {
+ action = methods.replace('_CREATE', '鍒涘缓琛�');
+ } else if (methods.includes('_ADD')) {
+ action = methods.replace('_ADD', '澧炲姞鍒�');
+ } else if (methods.includes('_DROP')) {
+ action = methods.replace('_DROP', '绉婚櫎鍒�');
+ } else {
+ action = '鏈煡';
}
outputData.push({
id: id,
@@ -1437,12 +1465,12 @@
width: 100%;
}
- .el-tag{
- line-height:22px;
+ .el-tag {
+ line-height: 22px;
height: 24px;
}
- .el-radio{
+ .el-radio {
margin-right: 20px;
}
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
index 75107ac..fcb4e6e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/lifeCycle/index.vue
@@ -1,6 +1,6 @@
<template>
<el-container>
- <el-aside style="width:310px;">
+ <el-aside style="width:333px;">
<basic-container>
<div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
<div class="headerCon">
--
Gitblit v1.9.3