From 884eab4f434aecba12e6b5227457c645e9558571 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 21 十一月 2024 18:18:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 42 +++++++------
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue | 2
Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue | 96 +++++++++++++++++--------------
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 3
4 files changed, 78 insertions(+), 65 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
index c1411cc..eae35e2 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
@@ -195,7 +195,7 @@
queryTemplate:{}
},
//宸叉湁鎺掑簭鍒楄〃閰嶇疆
- crudOption: {
+ crudOption: {
...basicOption,
addBtn: false,
editBtn: false,
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index a8dd219..73aa2b8 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -3,7 +3,8 @@
<el-aside>
<basic-container>
<div style="max-height: calc(100vh - 150px);overflow: auto">
- <avue-tree :key="refresh" node-key="id" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" node-key="id"
+ @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
<i :class="data.icon"></i>
@@ -17,8 +18,10 @@
<el-main>
<basic-container>
- <div v-if="(form.childType || form.childType === 0) && !addStatus && !editStatus && form.category !== 1" class="btnBox">
- <el-button :disabled="(mangeShowBtn || form.childType === 0) ? false : !childTypeBtn" icon="el-icon-plus" plain
+ <div v-if="(form.childType || form.childType === 0) && !addStatus && !editStatus && form.category !== 1"
+ class="btnBox">
+ <el-button :disabled="(mangeShowBtn || form.childType === 0) ? false : !childTypeBtn" icon="el-icon-plus"
+ plain
size="small"
type="primary" @click="addClickHandler">澧炲姞
</el-button>
@@ -56,8 +59,8 @@
<el-button v-if="editStatus" icon="el-icon-check" plain size="small"
type="success" @click="editSaveClickHandler">淇濆瓨
</el-button>
- <el-button icon="el-icon-close" plain size="small"
- type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
+ <el-button icon="el-icon-close" plain size="small"
+ type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
</el-button>
</div>
<div v-if="form.category === 1" class="btnBox">
@@ -208,7 +211,7 @@
addBtn: false,
menu: false,
height: 500,
- header:false,
+ header: false,
column: [
{
label: '鎿嶄綔鍒嗙被',
@@ -224,7 +227,7 @@
addStatus: false,
editStatus: false,
nodeRow: {},
- currentClickNode:null,
+ currentClickNode: null,
form: {},
treeData: [],
treeOption: {
@@ -250,7 +253,7 @@
id: item.id,
name: item.name,
leaf: !item.hasChildren,
- icon: item.source || 'iconfont iconicon_work'
+ icon: item.source || 'el-icon-s-home'
}
}))
})
@@ -280,10 +283,10 @@
},
methods: {
// 鏍戣鐐瑰嚮
- nodeClick(row,node) {
+ nodeClick(row, node) {
this.form = {...row};
this.nodeRow = {...row};
- this.currentClickNode=node;
+ this.currentClickNode = node;
this.addStatus = false;
this.editStatus = false;
},
@@ -294,7 +297,7 @@
this.defalutName.forEach(key => {
this.form[key] = null;
})
- this.form.isValid = false;
+ this.form.isValid = true;
this.addStatus = true;
this.editStatus = false;
},
@@ -426,12 +429,12 @@
addMethodsClickHandler() {
this.methodsLoading = true;
getSysModelTreeMenuByPID({parentId: 'operateNode'}).then(res => {
- if (res.data.code === 200 && res.data.data.length>0) {
+ if (res.data.code === 200 && res.data.data.length > 0) {
this.methodsVisble = true;
const data = res.data.data;
this.methodsData = data;
this.methodsLoading = false;
- }else {
+ } else {
this.$message.error('鏈壘鍒板彲澧炲姞鐨勬搷浣滅被鍨�');
}
})
@@ -531,19 +534,20 @@
upLoadClickHandler() {
this.$refs.upload.visible = true;
},
+
handleRefreshTree(type) {
//type:add\edit\del
- if(type=="del"){
+ if (type == "del") {
this.$refs.tree.remove(this.currentClickNode);
- this.currentClickNode=null;
- this.form={};
- }else{
+ this.currentClickNode = null;
+ this.form = {};
+ } else {
if (this.currentClickNode) {
let node = this.currentClickNode.parent;
node.loaded = false;
node.expand();
this.$refs.tree.setCurrentNode(this.currentClickNode);
- }else {
+ } else {
this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
}
}
@@ -561,7 +565,7 @@
.btnBox {
display: flex;
- justify-content:left;
+ justify-content: left;
margin-bottom: 15px;
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index e0c2963..614abf6 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -253,7 +253,7 @@
id: item.id,
name: item.name,
leaf: !item.hasChildren,
- icon: item.source || 'iconfont iconicon_work'
+ icon: item.source || 'el-icon-s-home'
}
}))
})
@@ -524,6 +524,7 @@
upLoadClickHandler() {
this.$refs.upload.visible = true;
},
+
handleRefreshTree(type) {
//type:add\edit\del
if (type == "del") {
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
index 6af6e5f..62e26a7 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
@@ -3,7 +3,8 @@
<el-aside>
<basic-container>
<div style="max-height: calc(100vh - 150px);overflow: auto">
- <avue-tree :key="refresh" node-key="id" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" node-key="id"
+ @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
<i class="el-icon-s-promotion"></i>
@@ -25,19 +26,22 @@
<el-button v-if="addStatus" icon="el-icon-check" plain size="small"
type="success" @click="addSaveClickHandler">淇濆瓨
</el-button>
- <el-button v-if="!addStatus && !editStatus" :disabled="nodeRow.childType === -1" icon="el-icon-edit" plain size="small" type="primary"
+ <el-button v-if="!addStatus && !editStatus" :disabled="nodeRow.childType === -1" icon="el-icon-edit" plain
+ size="small" type="primary"
@click="editClickHandler">淇敼
</el-button>
<el-button v-if="editStatus" icon="el-icon-check" plain size="small"
type="success" @click="editSaveClickHandler">淇濆瓨
</el-button>
- <el-button v-if="addStatus || editStatus" icon="el-icon-close" plain size="small"
- type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
+ <el-button v-if="addStatus || editStatus" icon="el-icon-close" plain size="small"
+ type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
</el-button>
- <el-button v-if="!addStatus && !editStatus" :disabled="nodeRow.childType === -1" icon="el-icon-close" plain size="small" type="danger"
+ <el-button v-if="!addStatus && !editStatus" :disabled="nodeRow.childType === -1" icon="el-icon-close" plain
+ size="small" type="danger"
@click="delClickHandler">鍒犻櫎
</el-button>
- <el-button v-if="!addStatus && !editStatus" icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
+ <el-button v-if="!addStatus && !editStatus" icon="el-icon-upload2" plain size="small" type="primary"
+ @click="sqlClickExportClick">瀵煎嚭sql
</el-button>
</div>
<el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
@@ -51,7 +55,8 @@
<el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
</el-form-item>
<el-form-item label="椤哄簭锛�">
- <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :min="0" :max="9999" label="椤哄簭"></el-input-number>
+ <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :max="9999" :min="0"
+ label="椤哄簭"></el-input-number>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
<el-input v-model="form.remark" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
@@ -65,18 +70,18 @@
<script>
//绠＄悊鍔熻兘妯″潡
import {exportFunctionSql, getSysModelTreeMenuByPID} from "@/api/systemModel/mangeModel/api"
-import {addOperationType,updateOperationType,delOperationType} from "@/api/systemModel/operateType/api"
+import {addOperationType, updateOperationType, delOperationType} from "@/api/systemModel/operateType/api"
import func from "@/util/func";
export default {
name: "index",
data() {
return {
- refresh:Math.random(),
- editStatus:false,
+ refresh: Math.random(),
+ editStatus: false,
addStatus: false,
nodeRow: {},
- currentClickNode:null,
+ currentClickNode: {},
form: {},
treeData: [],
treeOption: {
@@ -111,15 +116,13 @@
},
created() {
},
- computed: {
- },
+ computed: {},
methods: {
// 鏍戣鐐瑰嚮
- nodeClick(row,node) {
- console.log(row);
+ nodeClick(row, node) {
this.form = {...row};
this.nodeRow = {...row};
- this.currentClickNode=node;
+ this.currentClickNode = node;
this.addStatus = false;
this.editStatus = false;
},
@@ -169,29 +172,29 @@
}
this.form.parentId = this.nodeRow.id;
const params = {
- name:this.form.name,
- identify:this.form.code,
- alias:this.form.alias,
- desc:this.form.remark,
- seq:this.form.sort
+ name: this.form.name,
+ identify: this.form.code,
+ alias: this.form.alias,
+ desc: this.form.remark,
+ seq: this.form.sort
}
addOperationType(params).then(res => {
- if(res.data.code === 200){
+ if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.handleRefreshTree('add')
+ this.handleRefreshTree('add');
this.addStatus = false;
}
})
},
// 淇敼鎸夐挳
- editClickHandler(){
+ editClickHandler() {
this.addStatus = false;
this.editStatus = true;
},
// 淇敼淇濆瓨
- editSaveClickHandler(){
+ editSaveClickHandler() {
console.log(this.form);
if (!this.form.name) {
this.$message.error('鍚嶇О涓嶈兘涓虹┖');
@@ -205,9 +208,9 @@
this.$message.error('鍒悕涓嶈兘涓虹┖');
return
}
- if (!this.form.sort) {
+ if (this.form.sort == null || this.form.sort === '' || this.form.sort === undefined) {
this.$message.error('椤哄簭涓嶈兘涓虹┖');
- return
+ return;
}
if (this.form.name.length > 128) {
this.$message.error('鍚嶇О闀垮害涓嶈兘瓒呰繃128锛�');
@@ -220,26 +223,27 @@
if (this.form.alias && this.form.alias.length > 255) {
this.$message.error('鍒悕闀垮害涓嶈兘瓒呰繃255锛�');
return
- };
+ }
+ ;
const params = {
- id:this.form.id,
- name:this.form.name,
- identify:this.form.code,
- alias:this.form.alias,
- desc:this.form.remark,
- seq:this.form.sort
+ id: this.form.id,
+ name: this.form.name,
+ identify: this.form.code,
+ alias: this.form.alias,
+ desc: this.form.remark,
+ seq: this.form.sort
}
updateOperationType(params).then(res => {
- if(res.data.code === 200){
+ if (res.data.code === 200) {
this.$message.success(res.data.msg);
- this.handleRefreshTree('edit')
+ this.handleRefreshTree('edit');
this.editStatus = false;
}
})
},
// 鍒犻櫎
- delClickHandler(){
+ delClickHandler() {
this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎鎵�閫夋嫨鐨勬暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -271,17 +275,21 @@
},
handleRefreshTree(type) {
//type:add\edit\del
- if(type=="del"){
+ if (type == "del") {
this.$refs.tree.remove(this.currentClickNode);
- this.currentClickNode=null;
- this.form={};
- }else{
+ this.currentClickNode = null;
+ this.form = {};
+ } else {
if (this.currentClickNode) {
let node = this.currentClickNode.parent;
node.loaded = false;
node.expand();
- this.$refs.tree.setCurrentNode(this.currentClickNode);
- }else {
+ if (type === 'edit') {
+ this.$refs.tree.setCurrentKey(null);
+ } else {
+ this.$refs.tree.setCurrentNode(this.nodeRow);
+ }
+ } else {
this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
}
}
@@ -299,7 +307,7 @@
.btnBox {
display: flex;
- justify-content:left;
+ justify-content: left;
margin-bottom: 15px;
}
</style>
--
Gitblit v1.9.3