Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 183d15b9 by liuyong
Options

Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

2 parents a80f8c69 941dd4a7
Expand all
Inline Side-by-side
Showing with 282 additions and 121 deletions
src/views/archiViewConfig/index.vue
......@@ -90,36 +90,32 @@
<el-dialog
:title="title"
:visible.sync="add_dialog"
top="4%"
:center="false"
width="50%">
width="60%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构视图名称</div>
<el-input v-model="formData.viewName" placeholder="请输入内容" class="search_item"></el-input>
<!-- <el-select v-model="formData.viewName" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option>
</el-select> -->
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构层次</div>
<el-select v-model="formData.archiLevelId" placeholder="请选择" clearable class="search_item">
<el-form :model="formData" :rules="rules" ref="viewForm">
<div class="form_item_container">
<el-form-item class="cross" label="架构视图名称:" prop="viewName">
<el-input v-model="formData.viewName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="架构层次:" prop="archiLevelId">
<el-select v-model="formData.archiLevelId" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构归属</div>
<el-select v-model="formData.archiBelongId" placeholder="请选择" clearable class="search_item">
</el-form-item>
<el-form-item class="cross" label="架构层次:" prop="archiBelongId">
<el-select v-model="formData.archiBelongId" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</el-form-item>
<el-form-item class="cross1" label="视图描述:" prop="content">
<el-input type="textarea" :rows="3" maxlength="200" show-word-limit placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</el-form-item>
</div>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>视图描述</div>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</div>
</el-form>
<div class="dialog_form_item">
<div class="dialog_form_item_title">*元素范围</div>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>元素范围</div>
<el-table :data="tableData1" ref="multipleTable1" border height="195" @selection-change="handleSelectionChange1">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
......@@ -127,7 +123,7 @@
</el-table>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">*元素关系范围</div>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系范围</div>
<el-table :data="tableData2" ref="multipleTable2" border height="195" @selection-change="handleSelectionChange2">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
......@@ -184,6 +180,20 @@ export default {
archiEleRelId: "",
relName: "",
},
rules: {
viewName: [
{ required: true, message: '请输入架构视图名称', trigger: 'blur' },
],
archiLevelId: [
{ required: true, message: '请选择架构层次', trigger: 'change' },
],
archiBelongId: [
{ required: true, message: '请选择架构归属', trigger: 'change' },
],
content: [
{ required: true, message: '请输入视图描述', trigger: 'blur' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -356,6 +366,9 @@ export default {
this.add_dialog = true;
this.title = "新建架构视图";
this.resetForm();
this.$nextTick(() => {
this.$refs.viewForm.resetFields();
});
}else if (type == "edit") {
this.add_dialog = true;
this.title = "编辑架构视图";
......@@ -374,10 +387,6 @@ export default {
if (item.archiEleRelId) {
this.selectData4 = item.archiEleRelId.split(",");
}
// this.selectData1 = item.eleName.split(",");
// this.selectData2 = item.archiEleId.split(",");
// this.selectData3 = item.relName.split(",");
// this.selectData4 = item.archiEleRelId.split(",");
this.tableData1.forEach(item => {
this.selectData2.forEach(item2 => {
if (item.elementId == item2) {
......@@ -397,6 +406,16 @@ export default {
});
});
}else if (type == "create") {
this.$refs.viewForm.validate(valid => {
if(valid) {
if (this.selectData1.length == 0) {
this.$message.error("请勾选元素范围");
return;
}
if (this.selectData3.length == 0) {
this.$message.error("请勾选元素关系范围");
return;
}
this.formData.state = 2;
// 赋值
this.formData.eleName = this.selectData1.join(",");
......@@ -428,6 +447,8 @@ export default {
}
});
}
}
});
}else if (type == "pushAdd") {
this.formData.state = 1;
this.formData.eleName = this.selectData1.join(",");
......@@ -602,6 +623,32 @@ export default {
justify-content: flex-start;
align-items: center;
}
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 32% !important;
/deep/ .el-form-item__label{
width: 40%;
}
/deep/ .el-form-item__content{
width: 60% !important;
}
}
.cross1{
width: 100% !important;
/deep/ .el-form-item__label{
width: 13%;
}
/deep/ .el-form-item__content{
width: 83% !important;
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
.dialog_content_1{
display: flex;
justify-content: space-between;
......@@ -713,6 +760,7 @@ export default {
margin-top: 50px;
}
.dialog_form_item{
width: 96%;
display: flex;
align-items: center;
margin-bottom: 10px;
......@@ -720,10 +768,11 @@ export default {
.dialog_form_item_title{
flex-shrink: 0;
margin-right: 15px;
width: 100px;
width: 130px;
text-align: right;
.reqIcon{
color: red;
color: #F56C6C;
margin-right: 4px;
}
}
/deep/ .el-dialog__header{
......
src/views/metaModelDic/pages/page1.vue
......@@ -48,17 +48,12 @@
</el-table-column>
<el-table-column prop="content" label="描述" align="center"></el-table-column>
<!-- <el-table-column label="图标" align="center">
<template>
<el-button type="text" style="color: #0D867F;">预览</el-button>
</template>
</el-table-column> -->
<el-table-column label="图标" align="center">
<template slot-scope="scope">
<img :src="scope.row.icon" alt="" style="width: 50%;">
</template>
</el-table-column>
<el-table-column prop="version" label="版本" align="center"></el-table-column>
<el-table-column label="状态" align="center">
</el-table-column> -->
<el-table-column prop="version" label="字典版本号" align="center"></el-table-column>
<el-table-column label="字典版本状态" align="center">
<template slot-scope="scope">
<span>{{dicObj.state[scope.row.state]}}</span>
</template>
......@@ -179,34 +174,27 @@
:center="false"
width="40%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input>
</div>
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input>
</div>
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
<el-form :model="formData2" :rules="rules" ref="page1Form">
<div class="form_item_container">
<el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="长度:" prop="contentLength">
<el-input v-model="formData2.contentLength" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="控件:" prop="controlType">
<el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button>
......@@ -265,6 +253,23 @@ export default {
contentLength: "",
controlType: "",
},
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -540,6 +545,9 @@ export default {
this.add_dialog2 = true;
this.title2 = "新建字典属性";
this.resetFormData2();
this.$nextTick(() => {
this.$refs.page1Form.resetFields();
});
break;
// 编辑
case 'edit':
......@@ -549,6 +557,8 @@ export default {
break;
// 保存
case 'save':
this.$refs.page1Form.validate(valid => {
if(valid) {
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
......@@ -599,6 +609,8 @@ export default {
}
});
}
}
});
break;
// 删除
case 'del':
......@@ -658,6 +670,26 @@ export default {
}
.add_dialog_content{
width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
}
.dialog_content_1{
width: 100%;
......
src/views/metaModelDic/pages/page2.vue
......@@ -41,15 +41,15 @@
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column>
<el-table-column prop="content" label="关系描述" align="center"></el-table-column>
<el-table-column label="图标" align="center" width="100">
<!-- <el-table-column label="图标" align="center" width="100">
<template slot-scope="scope">
<div class="tableIcon">
<img class="iconItem" :src="scope.row.icon" alt="">
</div>
</template>
</el-table-column>
<el-table-column prop="version" label="版本" width="250" align="center"></el-table-column>
<el-table-column prop="state" label="状态" width="100" align="center">
</el-table-column> -->
<el-table-column prop="version" label="字典版本号" width="250" align="center"></el-table-column>
<el-table-column prop="state" label="字典版本状态" width="150" align="center">
<template slot-scope="scope">
<span >{{dicObj.state[scope.row.state]}}</span>
</template>
......@@ -174,34 +174,27 @@
:center="false"
width="40%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
<el-form :model="formData2" :rules="rules" ref="page2Form">
<div class="form_item_container">
<el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="长度:" prop="contentLength">
<el-input v-model="formData2.contentLength" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="控件:" prop="controlType">
<el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button>
......@@ -266,6 +259,23 @@ export default {
contentLength: "",
controlType: "",
},
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -496,6 +506,9 @@ export default {
this.add_dialog2 = true;
this.title2 = "新建字典属性";
this.resetFormData2();
this.$nextTick(() => {
this.$refs.page2Form.resetFields();
});
break;
// 编辑
case 'edit':
......@@ -505,6 +518,8 @@ export default {
break;
// 保存
case 'save':
this.$refs.page2Form.validate(valid => {
if(valid) {
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
......@@ -555,6 +570,8 @@ export default {
}
});
}
}
});
break;
// 删除
case 'del':
......@@ -624,6 +641,29 @@ export default {
width: 260px;
}
}
.add_dialog_content{
width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
}
.search_menu{
display: flex;
justify-content: space-between;
......
src/views/metaModelDic/pages/page3.vue
......@@ -49,8 +49,8 @@
<el-table-column prop="content" label="视图描述" width="150" align="center"></el-table-column>
<el-table-column prop="eleName" label="元素范围" width="150" align="center"></el-table-column>
<el-table-column prop="relName" label="包含元素" width="150" align="center"></el-table-column>
<el-table-column prop="version" label="版本" width="150" align="center"></el-table-column>
<el-table-column prop="state" label="状态" align="center">
<el-table-column prop="version" label="字典版本号" width="150" align="center"></el-table-column>
<el-table-column prop="state" label="字典版本状态" align="center">
<template slot-scope="scope">
<span >{{dicObj.state[scope.row.state]}}</span>
</template>
......@@ -173,34 +173,27 @@
:center="false"
width="40%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
<el-form :model="formData2" :rules="rules" ref="page3Form">
<div class="form_item_container">
<el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="长度:" prop="contentLength">
<el-input v-model="formData2.contentLength" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="控件:" prop="controlType">
<el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button>
......@@ -260,6 +253,23 @@ export default {
contentLength: "",
controlType: "",
},
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -561,6 +571,9 @@ export default {
this.add_dialog2 = true;
this.title2 = "新建字典属性";
this.resetFormData2();
this.$nextTick(() => {
this.$refs.page3Form.resetFields();
});
break;
// 编辑
case 'edit':
......@@ -570,6 +583,8 @@ export default {
break;
// 保存
case 'save':
this.$refs.page3Form.validate(valid => {
if(valid) {
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
......@@ -620,6 +635,8 @@ export default {
}
});
}
}
});
break;
// 删除
case 'del':
......@@ -670,6 +687,29 @@ export default {
justify-content: flex-start;
align-items: center;
}
.add_dialog_content{
width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
}
.newBtn{
margin-top: 5px;
.addItem{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!