From 2eb5f8645abbb13f9c358120a6ff53cfb9772dd3 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期一, 06 一月 2025 14:39:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 2
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 97 +++++++--------
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java | 23 +++
Source/plt-web/plt-web-ui/src/router/avue-router.js | 1
Source/plt-web/plt-web-ui/src/styles/ui.scss | 3
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java | 3
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java | 34 +++++
Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue | 17 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java | 13 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 10
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 98 +++++++--------
Source/plt-web/plt-web-ui/src/components/PLT-basic-component/iconShow.vue | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java | 4
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue | 9 +
Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue | 15 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java | 7
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java | 1
Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue | 10 +
18 files changed, 206 insertions(+), 143 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java
index a631dd8..0a20719 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PLActionDTO.java
@@ -67,4 +67,8 @@
* 鐖惰妭鐐筰d
*/
private String plActionCls;
+ /**
+ * 鍥炬爣
+ */
+ private String plImage;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java
new file mode 100644
index 0000000..3f46b36
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OperateVO.java
@@ -0,0 +1,23 @@
+
+package com.vci.pagemodel;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 鎿嶄綔绫诲瀷灞炴��
+ */
+@Data
+public class OperateVO implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String id;
+ private String name;// 鍚嶇О
+ private String identify;// 鏍囪瘑
+ private String alias;//鍒悕
+ private String desc;// 鎻忚堪
+ private long seq;//椤哄簭
+ private String source;//鍥炬爣
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
index 3cce295..feedbf5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
@@ -8,6 +8,7 @@
import com.vci.dto.RoleInfoDTO;
import com.vci.dto.RoleRightParamDTO;
import com.vci.dto.RoleRightParamDTOS;
+import com.vci.pagemodel.OperateVO;
import com.vci.web.service.ISmFunctionQueryService;
import com.vci.web.service.SmHMSysModConfigServiceI;
import com.vci.pagemodel.AppConfigDetailInfoVO;
@@ -253,13 +254,13 @@
/**
* 娣诲姞鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@PostMapping("/addOperationType")
- public BaseResult addOperationType(@RequestBody OperateInfo operateInfo) {
+ public BaseResult addOperationType(@RequestBody OperateVO operateVO) {
try {
- return BaseResult.success(hmSysModConfigService.addOperationType(operateInfo),"娣诲姞鎿嶄綔绫诲瀷鎴愬姛");
+ return BaseResult.success(hmSysModConfigService.addOperationType(operateVO),"娣诲姞鎿嶄綔绫诲瀷鎴愬姛");
}catch (Exception e){
e.printStackTrace();
String errorMsg = "娣诲姞鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
@@ -270,13 +271,13 @@
/**
* 淇敼鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@PutMapping("/updateOperationType")
- public BaseResult updateOperationType(@RequestBody OperateInfo operateInfo) {
+ public BaseResult updateOperationType(@RequestBody OperateVO operateVO) {
try {
- return BaseResult.success(hmSysModConfigService.updateOperationType(operateInfo),"淇敼鎿嶄綔绫诲瀷鎴愬姛");
+ return BaseResult.success(hmSysModConfigService.updateOperationType(operateVO),"淇敼鎿嶄綔绫诲瀷鎴愬姛");
}catch (Exception e){
e.printStackTrace();
String errorMsg = "淇敼鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
index b6e5542..bedcaea 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
@@ -5,6 +5,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.OperateVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
@@ -59,14 +60,14 @@
* 澧炲姞鎿嶄綔绫诲瀷
* @return
*/
- OperateInfo addOperationType(OperateInfo operateInfo);
+ OperateInfo addOperationType(OperateVO operateVO);
/**
* 淇敼鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
- OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException;
+ OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException;
/**
* 鍒犻櫎鎿嶄綔绫诲瀷
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 0a8fec3..6661629 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
@@ -241,6 +241,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().savePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"淇濆瓨澶辫触锛侊紒"});
@@ -274,6 +275,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().updatePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"淇敼澶辫触锛侊紒"});
@@ -299,6 +301,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().deletePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"鍒犻櫎澶辫触锛侊紒"});
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
index e9c4efa..5b7405f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
@@ -575,6 +575,7 @@
menuVO.setSort((int) operateInfo.seq);
menuVO.setModeType("operateObject");
menuVO.setHasChildren(false);
+ menuVO.setSource(operateInfo.image);
menuVOList.add(menuVO);
}
}catch (PLException e) {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
index 0a8e9b1..00e1816 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
@@ -7,6 +7,7 @@
import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.OperateVO;
import com.vci.starter.poi.bo.SheetDataSet;
import com.vci.starter.poi.bo.SheetRowData;
import com.vci.starter.poi.bo.WriteExcelData;
@@ -25,6 +26,7 @@
import com.vci.web.util.PlatformClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -116,6 +118,9 @@
VciBaseUtil.alertNotNull(menuVO,"淇敼鐨勬ā鍧楀璞�");
try {
String res = "";
+ if(!menuVO.getAlias().matches("[a-z A-Z \\p{Punct}+]*")){
+ throw new VciBaseException("娉ㄦ剰锛氬睘鎬у悕鍙兘涓鸿嫳鏂囧瓧姣�!");
+ }
//鏇存柊鏁版嵁搴�
res = foDelegate.updateMod(menuVO);
/**
@@ -224,12 +229,30 @@
}
/**
+ * 鎿嶄綔瀵硅薄澶嶅埗
+ * @param operateVO 鎿嶄綔浼犺緭瀵硅薄
+ * @param operateInfo 鎿嶄綔淇℃伅
+ */
+ private void copyOperationProperties(OperateVO operateVO, OperateInfo operateInfo){
+ operateInfo.id = operateVO.getId();
+ operateInfo.name = operateVO.getName();
+ operateInfo.alias = operateVO.getAlias();
+ operateInfo.image = operateVO.getSource();
+ operateInfo.desc = operateVO.getDesc();
+ operateInfo.identify = operateVO.getIdentify();
+ operateInfo.seq = operateVO.getSeq();
+ }
+
+ /**
* 澧炲姞鎿嶄綔绫诲瀷
* @return
*/
@Override
- public OperateInfo addOperationType(OperateInfo operateInfo) throws VciBaseException {
+ public OperateInfo addOperationType(OperateVO operateVO) throws VciBaseException {
try {
+ OperateInfo operateInfo = new OperateInfo();
+ copyOperationProperties(operateVO,operateInfo);
+ operateInfo.image = operateVO.getSource();
//鏍￠獙
this.checkItem(operateInfo);
String s = foDelegate.saveOperate(operateInfo);
@@ -253,13 +276,16 @@
/**
* 淇敼鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@Override
- public OperateInfo updateOperationType(OperateInfo operateInfo) throws VciBaseException {
+ public OperateInfo updateOperationType(OperateVO operateVO) throws VciBaseException {
try {
+ OperateInfo operateInfo = new OperateInfo();
+ copyOperationProperties(operateVO, operateInfo);
this.checkItem(operateInfo);
+ operateInfo.image = operateVO.getSource();
String res = foDelegate.updateOperate(operateInfo);
/**杩斿洖1琛ㄧず鍚嶇О鏈夐噸澶嶏紝杩斿洖2琛ㄧず鏍囪瘑鏈夐噸澶�,杩斿洖3琛ㄧず椤哄簭鏈夐噸澶�**/
if (res.equals("1")) {
@@ -329,7 +355,7 @@
if (operateInfo.name.length() > 128) {
throw new VciBaseException("鍚嶇О闀垮害涓嶈兘瓒呰繃128锛�");
}
- if (operateInfo.desc.length() > 255) {
+ if (operateInfo.desc != null &&operateInfo.desc.length() > 255) {
throw new VciBaseException("鎻忚堪闀垮害涓嶈兘瓒呰繃255锛�");
}
if (operateInfo.alias.length() > 128) {
diff --git a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/iconShow.vue b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/iconShow.vue
index ef8b97f..0aedce9 100644
--- a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/iconShow.vue
+++ b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/iconShow.vue
@@ -39,7 +39,7 @@
svg{
font-size: inherit;
height: 100%;
- width:auto;
+ width:100%;
}
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue
index a0596a1..aee44d0 100644
--- a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue
+++ b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue
@@ -2,7 +2,7 @@
<div>
<el-input :width="width" :class="inputClass" :style="inputStyle" :clearable="true" :value="value"
:disabled="disabled" :placeholder="placeholder" type="text" :size="size" @clear="clearValue" @focus="handleFocus">
- <span slot="append" v-html="svgHtml" style="font-size: 20px;padding:3px 10px;width:20px;height:20px;display: block" @click="handleFocus"></span>
+ <span slot="append" v-html="svgHtml" style="font-size: 18px;padding:3px 10px;width:18px;height:18px;display: block" @click="handleFocus"></span>
</el-input>
<el-dialog v-dialogDrag
v-dialog-resize
@@ -205,6 +205,11 @@
.el-input-group__append, .el-input-group__prepend{
padding: 0;
}
+ svg{
+ font-size: inherit;
+ height: 100%;
+ width:100%;
+ }
}
.tag-group{font-size: 14px;}
.el-tag{
@@ -223,6 +228,9 @@
}
.iconList .iconItem .svgContent{
font-size: 24px;
+ width: 24px;
+ height: 24px;
+ margin: 0 auto;
}
.iconList .iconItem .svgContent:hover{
transform: scale(1.5);
diff --git a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
index ade24e2..2bbc1ff 100644
--- a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
+++ b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
@@ -8,7 +8,7 @@
@click="open(item)">
<div style="display: flex">
<icon-show :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <span slot="title"
+ <span slot="title" style="margin-left: 8px;"
:alt="item[pathKey]"
:class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
</div>
@@ -19,7 +19,7 @@
<template slot="title">
<div style="display: flex">
<icon-show :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <span slot="title"
+ <span slot="title" style="margin-left: 8px;"
:class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
</div>
</template>
@@ -31,7 +31,7 @@
@click="open(child)">
<div style="display: flex">
<icon-show :name="child[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <span slot="title">{{ generateTitle(child) }}</span>
+ <span slot="title" style="margin-left: 8px;">{{ generateTitle(child) }}</span>
</div>
</el-menu-item>
<sidebar-item v-else
@@ -137,7 +137,8 @@
open(item) {
const query = {
...item.query,
- id:item.id
+ id:item.id,
+ name:item.name
}
if (this.screen <= 1) this.$store.commit("SET_COLLAPSE");
if (this.validIsOpen(item)) {
@@ -162,13 +163,13 @@
outline: 0;
background-color: #060708;
}
-
.iconShowSpan{
display: inline-block;
- margin-top: -2px;
- margin-right: 10px;
color: rgba(255, 255, 255, 0.7);
}
+.el-menu-item .iconShowSpan,.el-submenu__title .iconShowSpan{
+ margin-top: -2px;
+}
.el-submenu__title:hover .iconShowSpan{
color: #ffffff;
}
diff --git a/Source/plt-web/plt-web-ui/src/router/avue-router.js b/Source/plt-web/plt-web-ui/src/router/avue-router.js
index e3f8fbe..1b04180 100644
--- a/Source/plt-web/plt-web-ui/src/router/avue-router.js
+++ b/Source/plt-web/plt-web-ui/src/router/avue-router.js
@@ -150,6 +150,7 @@
icon = oMenu[propsDefault.icon],
children = oMenu[propsDefault.children],
meta = oMenu[propsDefault.meta] || {};
+ meta.keepAlive=true;
// meta涓� keepalive 鐨勫鐞�
meta = Object.assign(meta, (function () {
if (option.keepAlive === true) {
diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss
index ff4eb74..810be2c 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -560,6 +560,7 @@
height: 16px !important;
margin-right: 6px;
}
+
/*
鏍�
*/
@@ -575,7 +576,7 @@
margin-right: 3px;
}
.el-tree-node__label [class*=" el-icon-"],.el-tree-node__label [class^=el-icon-]{
- font-size: 14px;margin-top: 3px;
+ font-size: 14px;margin-top: 4px; margin-right: 3px;
}
.el-select{
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
index 51e1ee6..04e6ac3 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/components/dialog.vue
@@ -49,6 +49,11 @@
{{ row.plTypeType === 'business' ? '涓氬姟绫诲瀷' : '閾炬帴绫诲瀷' }}
</el-tag>
</template>
+ <template slot="plImage" slot-scope="{row}">
+ <span class="avue-icon">
+ <icon-show :name="row.plImage"></icon-show>
+ </span>
+ </template>
</avue-crud>
</div>
</basic-container>
@@ -102,8 +107,8 @@
search: true
},
{
- label: 'C/S绫昏矾寰�',
- prop: 'plCSClass',
+ label: '鍥炬爣',
+ prop: 'plImage',
search: true,
searchLabelWidth:120,
overHidden: true,
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 e1f0511..b403bec 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
@@ -71,13 +71,13 @@
@refresh-change="handleRefresh"
@selection-change="selectChangeHandler"
@row-click="rowClickHandler">
- <template slot="plCSClass" slot-scope="{row}">
+ <template slot="plImage" slot-scope="{row}">
<span class="avue-icon">
- <icon-show :name="row.plCSClass"></icon-show>
+ <icon-show :name="row.plImage"></icon-show>
</span>
</template>
- <template slot-scope="{type,disabled}" slot="plCSClassForm">
- <input-icon :disabled="disabled" v-model="form.plCSClass"></input-icon>
+ <template slot-scope="{type,disabled}" slot="plImageForm">
+ <input-icon :disabled="disabled" v-model="form.plImage"></input-icon>
</template>
<template slot="plTypeType" slot-scope="{row}">
<el-tag :type="row.plTypeType === 'business' ? '' : 'success'">
@@ -298,7 +298,7 @@
},
{
label: '鍥炬爣',
- prop: 'plCSClass',
+ prop: 'plImage',
width: 80,
rules: [
{
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 efa462c..ad110fe 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,7 +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.$set(this.basicForm, 'iconPath', val.plImage);//鍥炬爣
this.$refs.form.clearValidate('Action')
},
// action閫夋嫨寮圭獥鐩存帴鍏抽棴
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 ac1d0e7..b590439 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
@@ -7,7 +7,8 @@
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="display: flex">
- <icon-show :name="data.icon"></icon-show>
+ <icon-show v-if="data.iconType=='svg'" :name="data.icon"></icon-show>
+ <i v-else :class="data.icon"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -72,32 +73,18 @@
<el-form ref="form" :model="form" label-width="100px" size="small"
style="max-height: calc(100vh - 200px);overflow: auto;">
<span v-if="form.category !== 1">
- <el-form-item>
- <span slot="label" style="display:inline-block;">
- 鑿滃崟鏍囪瘑锛�
- <el-tooltip class="item" content="璇疯緭鍏ヨ嫳鏂囧瓧绗︼紝骞朵繚璇佸敮涓�鎬э紒" effect="dark" placement="top-start">
- <i class='el-icon-star-on' style="color: #F56C6C"/>
- </el-tooltip>
- </span>
- <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"
- placeholder="璇疯緭鍏ヨ嫳鏂囧瓧绗︼紝骞朵繚璇佸敮涓�鎬э紒"></el-input>
+ <el-form-item class="is-required">
+ <span slot="label">妯″潡鍚嶏細</span>
+ <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
</el-form-item>
- <el-form-item>
- <span slot="label" style="display:inline-block;">
- 妯″潡鍚嶏細
- <i class='el-icon-star-on' style="color: #F56C6C"/>
- </span>
- <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
+ <el-form-item class="is-required">
+ <span slot="label">妯″潡鍒悕锛�</span>
+ <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀埆鍚�"></el-input>
</el-form-item>
- <el-form-item>
- <span slot="label" style="display:inline-block;">
- 搴忓彿锛�
- <el-tooltip class="item" content="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�" effect="dark" placement="top-start">
- <i class='el-icon-star-on' style="color: #F56C6C"/>
- </el-tooltip>
- </span>
- <el-input v-model="form.sort" :disabled="!editStatus && !addStatus"
- placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
+ <el-form-item class="is-required">
+ <span slot="label">搴忓彿锛�</span>
+ <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus"></el-input-number>
+ <el-link :underline="false" style="margin-left: 20px" type="danger">鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�</el-link>
</el-form-item>
<el-form-item v-if="form.functionType === 0" label="C/S锛�">
<el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞"
@@ -140,28 +127,27 @@
</el-form-item>
</span>
<span v-if="form.category === 1">
- <el-form-item label="鍚嶇О锛�">
- <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
+ <el-form-item label="鍚嶇О锛�" class="is-required">
+ <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
</el-form-item>
- <el-form-item label="鏍囪瘑锛�">
- <el-input v-model="form.code" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
+ <el-form-item label="鏍囪瘑锛�" class="is-required">
+ <el-input v-model="form.code" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
</el-form-item>
- <el-form-item label="鍒悕锛�">
- <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
+ <el-form-item label="鍒悕锛�" class="is-required">
+ <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
</el-form-item>
- <el-form-item label="缂栧彿锛�">
- <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
+ <el-form-item label="缂栧彿锛�" class="is-required">
+ <el-input-number v-model="form.sort" :disabled="form.category === 1" :max="63" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
+ <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
</el-form-item>
<el-form-item label="鏄惁鏈夋晥锛�">
- <el-switch
- v-model="form.isValid"
- active-color="#13ce66"
- inactive-color="#ff4949">
- </el-switch>
-
+ <el-switch
+ v-model="form.isValid"
+ active-color="#13ce66"
+ inactive-color="#ff4949">
+ </el-switch>
</el-form-item>
</span>
</el-form>
@@ -173,7 +159,7 @@
append-to-body="true"
class="avue-dialog"
title="鎿嶄綔鍒嗙被"
- width="500px"
+ width="900px"
>
<avue-crud
ref="methodsCrud"
@@ -227,13 +213,19 @@
menu: false,
height: 500,
header: false,
- column: [
- {
- label: '鎿嶄綔鍒嗙被',
- prop: 'name',
- sortable: true,
- }
- ]
+ column: [{
+ label: '鍚嶇О',
+ prop: 'name',
+ width:180,
+ sortable: true,
+ }, {
+ label: '鏍囪瘑',
+ prop: 'code',
+ width:180,
+ }, {
+ label: '鎻忚堪',
+ prop: 'remark'
+ }]
},
methodsLoading: false,
methodsVisble: false,
@@ -250,8 +242,9 @@
menu: false,
addBtn: false,
defaultExpandAll: false,
+ defaultExpandedKeys:['business'],
props: {
- label: 'name',
+ label: 'label',
value: 'id',
children: 'children',
},
@@ -265,10 +258,10 @@
resolve(res.data.data.map(item => {
return {
...item,
- id: item.id,
- name: item.name,
+ label: item.category!=1?item.name:item.alias,
leaf: !item.hasChildren,
- icon: item.source || 'iconoir:home'
+ icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
+ iconType:item.source?'svg':'iconfont'
}
}))
})
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 989d58a..d36f65f 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
@@ -7,7 +7,8 @@
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="display: flex">
- <icon-show :name="data.icon"></icon-show>
+ <icon-show v-if="data.iconType=='svg'" :name="data.icon"></icon-show>
+ <i v-else :class="data.icon"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -71,32 +72,18 @@
</div>
<el-form ref="form" :model="form" label-width="100px" style="max-height: calc(100vh - 200px);overflow: auto;">
<span v-if="form.category !== 1">
- <el-form-item>
- <span slot="label" style="display:inline-block;">
- 鑿滃崟鏍囪瘑锛�
- <el-tooltip class="item" effect="dark" content="璇疯緭鍏ヨ嫳鏂囧瓧绗︼紝骞朵繚璇佸敮涓�鎬э紒" placement="top-start">
- <i class='el-icon-star-on' style="color: #F56C6C"/>
- </el-tooltip>
- </span>
- <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"
- placeholder="璇疯緭鍏ヨ嫳鏂囧瓧绗︼紝骞朵繚璇佸敮涓�鎬э紒"></el-input>
+ <el-form-item class="is-required">
+ <span slot="label">妯″潡鍚嶏細</span>
+ <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
</el-form-item>
- <el-form-item>
- <span slot="label" style="display:inline-block;">
- 妯″潡鍚嶏細
- <i class='el-icon-star-on' style="color: #F56C6C"/>
- </span>
- <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
+ <el-form-item class="is-required">
+ <span slot="label">妯″潡鍒悕锛�</span>
+ <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀埆鍚�"></el-input>
</el-form-item>
- <el-form-item>
- <span slot="label" style="display:inline-block;">
- 搴忓彿锛�
- <el-tooltip class="item" content="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�" effect="dark" placement="top-start">
- <i class='el-icon-star-on' style="color: #F56C6C"/>
- </el-tooltip>
- </span>
- <el-input v-model="form.sort" :disabled="!editStatus && !addStatus"
- placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
+ <el-form-item class="is-required">
+ <span slot="label">搴忓彿锛�</span>
+ <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus"></el-input-number>
+ <el-link :underline="false" style="margin-left: 20px" type="danger">鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�</el-link>
</el-form-item>
<el-form-item v-if="form.functionType === 0" label="C/S锛�">
<el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞"
@@ -139,28 +126,27 @@
</el-form-item>
</span>
<span v-if="form.category === 1">
- <el-form-item label="鍚嶇О锛�">
- <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
+ <el-form-item label="鍚嶇О锛�" class="is-required">
+ <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
</el-form-item>
- <el-form-item label="鏍囪瘑锛�">
- <el-input v-model="form.code" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
+ <el-form-item label="鏍囪瘑锛�" class="is-required">
+ <el-input v-model="form.code" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
</el-form-item>
- <el-form-item label="鍒悕锛�">
- <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
+ <el-form-item label="鍒悕锛�" class="is-required">
+ <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
</el-form-item>
- <el-form-item label="缂栧彿锛�">
- <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
+ <el-form-item label="缂栧彿锛�" class="is-required">
+ <el-input-number v-model="form.sort" :disabled="form.category === 1" :max="63" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
+ <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
</el-form-item>
<el-form-item label="鏄惁鏈夋晥锛�">
- <el-switch
- v-model="form.isValid"
- active-color="#13ce66"
- inactive-color="#ff4949">
- </el-switch>
-
+ <el-switch
+ v-model="form.isValid"
+ active-color="#13ce66"
+ inactive-color="#ff4949">
+ </el-switch>
</el-form-item>
</span>
</el-form>
@@ -172,7 +158,7 @@
append-to-body="true"
class="avue-dialog"
title="鎿嶄綔鍒嗙被"
- width="500px"
+ width="900px"
>
<avue-crud
ref="methodsCrud"
@@ -226,13 +212,19 @@
menu: false,
height: 500,
header: false,
- column: [
- {
- label: '鎿嶄綔鍒嗙被',
- prop: 'name',
- sortable: true,
- }
- ]
+ column: [{
+ label: '鍚嶇О',
+ prop: 'name',
+ width:180,
+ sortable: true,
+ }, {
+ label: '鏍囪瘑',
+ prop: 'code',
+ width:180,
+ }, {
+ label: '鎻忚堪',
+ prop: 'remark'
+ }]
},
methodsLoading: false,
methodsVisble: false,
@@ -249,8 +241,9 @@
menu: false,
addBtn: false,
defaultExpandAll: false,
+ defaultExpandedKeys:['system'],
props: {
- label: 'name',
+ label: 'label',
value: 'id',
children: 'children',
},
@@ -264,10 +257,10 @@
resolve(res.data.data.map(item => {
return {
...item,
- id: item.id,
- name: item.name,
+ label: item.category!=1?item.name:item.alias,
leaf: !item.hasChildren,
- icon: item.source || 'iconoir:home'
+ icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
+ iconType:item.source?'svg':'iconfont'
}
}))
})
@@ -476,7 +469,6 @@
}
})
addOperationType(list).then(res => {
- console.log(res)
if (res.data.code === 200) {
this.methodsVisble = false;
this.$message.success(res.data.msg);
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 631f9ce..6888bb4 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
@@ -7,7 +7,8 @@
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="display: flex">
- <icon-show :name="data.icon"></icon-show>
+ <icon-show v-if="data.iconType=='svg'" :name="data.icon"></icon-show>
+ <i v-else :class="data.icon"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -45,21 +46,21 @@
</el-button>
</div>
<el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
- <el-form-item label="鍚嶇О锛�">
+ <el-form-item label="鍚嶇О锛�" class="is-required">
<el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
</el-form-item>
- <el-form-item label="鏍囪瘑锛�">
+ <el-form-item label="鏍囪瘑锛�" class="is-required">
<el-input v-model.trim="form.code" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
</el-form-item>
- <el-form-item label="鍒悕锛�">
+ <el-form-item label="鍒悕锛�" class="is-required">
<el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
</el-form-item>
- <el-form-item label="鍥炬爣锛�">
+ <el-form-item label="鍥炬爣锛�" class="is-required">
<input-icon v-model="form.source" :disabled="!editStatus && !addStatus" placeholder="璇烽�夋嫨鍥炬爣">
</input-icon>
</el-form-item>
<el-form-item label="椤哄簭锛�">
- <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :max="9999" :min="0"
+ <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :max="63" :min="1"
label="椤哄簭"></el-input-number>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
@@ -93,6 +94,7 @@
menu: false,
addBtn: false,
defaultExpandAll: false,
+ defaultExpandedKeys:['operateNode'],
props: {
label: 'name',
value: 'id',
@@ -111,7 +113,8 @@
id: item.id,
name: item.name,
leaf: !item.hasChildren,
- icon: item.source || 'iconoir:home'
+ icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
+ iconType:item.source?'svg':'iconfont'
}
}))
})
--
Gitblit v1.9.3