From 19561fb19832f49186b43d3fb0540b05ae754eae Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期一, 30 十二月 2024 21:43:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 1 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 40 ++++++++++++++++++++++++++++++----------
2 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
index fcf06d1..a93c5c3 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
@@ -22,7 +22,7 @@
</el-aside>
<el-main>
- <basic-container v-if="treeNodeRow.id === 'root' ">
+ <basic-container v-show="treeNodeRow.id === 'root' ">
<div>
<avue-crud
ref="treeCrud"
@@ -54,7 +54,7 @@
</avue-crud>
</div>
</basic-container>
- <basic-container v-else>
+ <basic-container v-show="treeNodeRow.id !== 'root'">
<div>
<avue-crud
ref="crud"
@@ -71,6 +71,14 @@
@refresh-change="handleRefresh"
@selection-change="selectChangeHandler"
@row-click="rowClickHandler">
+ <template slot="plCSClass" slot-scope="{row}">
+ <span class="avue-icon">
+ <icon-show :name="row.plCSClass"></icon-show>
+ </span>
+ </template>
+ <template slot-scope="{type,disabled}" slot="plCSClassForm">
+ <input-icon :disabled="disabled" v-model="form.plCSClass"></input-icon>
+ </template>
<template slot="plTypeType" slot-scope="{row}">
<el-tag :type="row.plTypeType === 'business' ? '' : 'success'">
{{ row.plTypeType === 'business' ? '涓氬姟绫诲瀷' : '閾炬帴绫诲瀷' }}
@@ -264,6 +272,7 @@
{
label: '缂栧彿',
prop: 'plCode',
+ width: 220,
overHidden: true,
search: true,
rules: [
@@ -288,6 +297,18 @@
]
},
{
+ label: '鍥炬爣',
+ prop: 'plCSClass',
+ width: 80,
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨鍥炬爣',
+ trigger: 'blur'
+ }
+ ]
+ },
+ {
label: '鍒嗙被',
prop: 'plActionCls',
type: 'tree',
@@ -295,7 +316,7 @@
props: {
label: 'name',
value: 'id',
- children: 'childs'
+ children: 'children'
},
rules: [
{
@@ -306,13 +327,13 @@
],
dicData: []
},
- {
+ /*{
label: 'C/S绫昏矾寰�',
prop: 'plCSClass',
- search: true,
+ hide:true,
searchLabelWidth:120,
overHidden: true,
- },
+ },*/
{
label: 'B/S閾炬帴鍦板潃',
prop: 'plBSUrl',
@@ -402,7 +423,7 @@
const data = res.data.obj;
this.treeData = this.treeDataFormAtter([data],'Action鍒嗙被');
const selectTreeData = this.option.column.find(item => item.prop === 'plActionCls'); // 鎵惧埌action娣诲姞鍒嗙被鏍�
- const dicData=[data];
+ const dicData=this.treeData;
dicData[0].disabled=true;//鏍硅妭鐐逛笉鑳介��
selectTreeData.dicData = dicData;
})
@@ -506,13 +527,12 @@
beforeOpen(done, type, loading) {
if ([ 'edit'].includes(type)) {
// 缂栬緫閫昏緫
- this.$set(this.option.column[2],'disabled',false);
+ this.$set(this.option.column[3],'disabled',false);
} else {
// 鏂板閫昏緫
- this.$set(this.option.column[2],'disabled',true);
+ this.$set(this.option.column[3],'disabled',true);
}
done();
- console.log(this.option.column)
},
// action鍒楄〃澧炲姞
addClickHandler() {
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 9151173..efa462c 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
@@ -1349,6 +1349,7 @@
actionSaveHandler(val) {
this.$set(this.basicForm, 'actionName', val.plName);
this.$set(this.basicForm, 'actionOId', val.plOId);
+ this.$set(this.basicForm, 'iconPath', val.plCSClass);//鍥炬爣
this.$refs.form.clearValidate('Action')
},
// action閫夋嫨寮圭獥鐩存帴鍏抽棴
--
Gitblit v1.9.3