From f22211dcc3767d8fb50a37eb424a258a12fe626b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 15:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionParamDTO.java | 2 +-
Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue | 28 ++++++++++++++++------------
Bin/PLTWEB/server/plt-web.jar | 0
Bin/PLTWEB/server/lib/plt-web-base-2024.1-SNAPSHOT.jar | 0
Bin/PLTWEB/server/lib/plt-common-1.0.RELEASE.jar | 0
Bin/PLTWEB/server/lib/plt-web-permission-2024.1-SNAPSHOT.jar | 0
Bin/PLTWEB/server/lib/plt-starter-2024.1-SNAPSHOT.jar | 0
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java | 6 +++---
Bin/PLTWEB/server/lib/plt-slice-1.0.RELEASE.jar | 0
Bin/PLTWEB/server/lib/plt-web-api-2024.1-SNAPSHOT.jar | 0
Bin/PLTWEB/server/lib/plt-clientbase-1.0.RELEASE.jar | 0
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 1 +
12 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/Bin/PLTWEB/server/lib/plt-clientbase-1.0.RELEASE.jar b/Bin/PLTWEB/server/lib/plt-clientbase-1.0.RELEASE.jar
index ad6c9ee..af669c8 100644
--- a/Bin/PLTWEB/server/lib/plt-clientbase-1.0.RELEASE.jar
+++ b/Bin/PLTWEB/server/lib/plt-clientbase-1.0.RELEASE.jar
Binary files differ
diff --git a/Bin/PLTWEB/server/lib/plt-common-1.0.RELEASE.jar b/Bin/PLTWEB/server/lib/plt-common-1.0.RELEASE.jar
index d43ede9..9c45af2 100644
--- a/Bin/PLTWEB/server/lib/plt-common-1.0.RELEASE.jar
+++ b/Bin/PLTWEB/server/lib/plt-common-1.0.RELEASE.jar
Binary files differ
diff --git a/Bin/PLTWEB/server/lib/plt-slice-1.0.RELEASE.jar b/Bin/PLTWEB/server/lib/plt-slice-1.0.RELEASE.jar
index fc58e2f..c3a4211 100644
--- a/Bin/PLTWEB/server/lib/plt-slice-1.0.RELEASE.jar
+++ b/Bin/PLTWEB/server/lib/plt-slice-1.0.RELEASE.jar
Binary files differ
diff --git a/Bin/PLTWEB/server/lib/plt-starter-2024.1-SNAPSHOT.jar b/Bin/PLTWEB/server/lib/plt-starter-2024.1-SNAPSHOT.jar
index dd69365..feda85f 100644
--- a/Bin/PLTWEB/server/lib/plt-starter-2024.1-SNAPSHOT.jar
+++ b/Bin/PLTWEB/server/lib/plt-starter-2024.1-SNAPSHOT.jar
Binary files differ
diff --git a/Bin/PLTWEB/server/lib/plt-web-api-2024.1-SNAPSHOT.jar b/Bin/PLTWEB/server/lib/plt-web-api-2024.1-SNAPSHOT.jar
index 1d3c91c..8f427bf 100644
--- a/Bin/PLTWEB/server/lib/plt-web-api-2024.1-SNAPSHOT.jar
+++ b/Bin/PLTWEB/server/lib/plt-web-api-2024.1-SNAPSHOT.jar
Binary files differ
diff --git a/Bin/PLTWEB/server/lib/plt-web-base-2024.1-SNAPSHOT.jar b/Bin/PLTWEB/server/lib/plt-web-base-2024.1-SNAPSHOT.jar
index 4d5678a..c3a7249 100644
--- a/Bin/PLTWEB/server/lib/plt-web-base-2024.1-SNAPSHOT.jar
+++ b/Bin/PLTWEB/server/lib/plt-web-base-2024.1-SNAPSHOT.jar
Binary files differ
diff --git a/Bin/PLTWEB/server/lib/plt-web-permission-2024.1-SNAPSHOT.jar b/Bin/PLTWEB/server/lib/plt-web-permission-2024.1-SNAPSHOT.jar
index a6b33a6..449ad79 100644
--- a/Bin/PLTWEB/server/lib/plt-web-permission-2024.1-SNAPSHOT.jar
+++ b/Bin/PLTWEB/server/lib/plt-web-permission-2024.1-SNAPSHOT.jar
Binary files differ
diff --git a/Bin/PLTWEB/server/plt-web.jar b/Bin/PLTWEB/server/plt-web.jar
index 9af7dfd..c177707 100644
--- a/Bin/PLTWEB/server/plt-web.jar
+++ b/Bin/PLTWEB/server/plt-web.jar
Binary files differ
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionParamDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionParamDTO.java
index 070f307..7460002 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionParamDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionParamDTO.java
@@ -33,5 +33,5 @@
/**
* 鐖禷ction鐨処D
*/
- public String action;
+ public String actionOid;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
index 6661629..38249fc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
@@ -524,7 +524,7 @@
param.name = dto.getName();
param.defaultValue = dto.getDefaultValue();
param.description = dto.getDescription();
- param.action = dto.getAction();
+ param.action = dto.getActionOid();
String message = platformClientUtil.getUIService().createPLActionParam(param);
if(message.startsWith("0")) {
@@ -547,7 +547,7 @@
param.name = dto.getName();
param.defaultValue = dto.getDefaultValue();
param.description = dto.getDescription();
- param.action = dto.getAction();
+ param.action = dto.getActionOid();
String message = platformClientUtil.getUIService().editPLActionParam(param);
if(message.startsWith("0")) {
@@ -589,7 +589,7 @@
List<PLActionParamDTO> dtos = new ArrayList<>();
for (PLActionParam paramArray : paramArrays) {
PLActionParamDTO dto = new PLActionParamDTO();
- dto.setAction(paramArray.action);
+ dto.setActionOid(paramArray.action);
dto.setOid(paramArray.oid);
dto.setName(paramArray.name);
dto.setDescription(paramArray.description);
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
index b574401..130cdaf 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
@@ -9,21 +9,23 @@
:close-on-click-modal="false"
@close="cancelDialog">
<el-container style="height: 550px">
- <el-aside>
- <basic-container style="height: 500px">
- <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <el-aside style="height: 500px">
+ <basic-container v-loading="leftLoading">
+ <div style="height: 425px">
+ <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span>
<i class="el-icon-user-solid"></i>
{{ (node || {}).label }}
</span>
</span>
- </avue-tree>
+ </avue-tree>
+ </div>
</basic-container>
</el-aside>
- <el-main>
- <basic-container style="height: 500px">
+ <el-main style="height: 500px">
+ <basic-container v-loading="rightLoading">
<h3 style="margin: 0">妯″潡鏉冮檺閰嶇疆</h3>
<div style="height: 445px;">
<avue-tree ref="uiTree" :data="uiTreeData" :option="uiTreeOption">
@@ -54,6 +56,8 @@
name: "UIDialog",
data() {
return {
+ leftLoading:false,
+ rightLoading:false,
dialog: {
showDialog: false,
title: "UI鎺堟潈",
@@ -104,18 +108,18 @@
this.dialog.showDialog = false;
},
getTreeList() {
- const loading = this.$loading({});
+ this.leftLoading = true;
gridRoles().then(res => {
this.treeData = res.data.data;
- loading.close();
+ this.leftLoading = false;
}).catch(error=>{
- loading.close();
+ this.leftLoading = false;
})
},
// 瑙掕壊鐐瑰嚮
nodeClick(row,node) {
this.nodeRow = row;
- const loading = this.$loading({});
+ this.rightLoading = true;
const params = {
'conditionMap[roleId]': this.nodeRow.oid,
'conditionMap[type]': this.type,
@@ -136,9 +140,9 @@
label: res.data.data[0].text,
children: res.data.data[0].children
}];
- loading.close();
+ this.rightLoading = false;
}).catch(error => {
- loading.close();
+ this.rightLoading = false;
})
},
//澶勭悊鏍�
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 8e88f58..3e14dae 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
@@ -362,6 +362,7 @@
label: '鍒嗙被',
prop: 'plActionCls',
type: 'tree',
+ defaultExpandedKeys:['root'],
props: {
label: 'name',
value: 'id',
--
Gitblit v1.9.3