From c6aa8e0dae3c87100d51e962229e05752d937092 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 20:47:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OpItemVO.java | 33 +++
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java | 4
Source/plt-web/plt-web-ui/src/api/system/user/api.js | 10
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsDataAuthServiceImpl.java | 122 ++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsDataAuthServiceI.java | 15 +
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue | 105 +++++----
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 225 +++++++++++++------
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java | 13 +
Source/plt-web/plt-web-ui/src/api/authority/ui/dataAuthor.js | 13 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuthResultDTO.java | 27 ++
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue | 4
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java | 4
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsDataAuthController.java | 37 +++
14 files changed, 482 insertions(+), 132 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuthResultDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuthResultDTO.java
new file mode 100644
index 0000000..ba049e0
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuthResultDTO.java
@@ -0,0 +1,27 @@
+package com.vci.dto;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鏁版嵁鏉冮檺鎿嶄綔淇℃伅浼犺緭瀵硅薄
+ * @author yuxc
+ * @date 2024/12/4
+ */
+@Data
+public class AuthResultDTO implements java.io.Serializable {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 814342725285373312L;
+
+ // 璁剧疆Table鍒楀ご淇℃伅
+ List<String> tableHeader;
+
+ //鍒楄〃鏁版嵁
+ List<Object> tableValues;
+
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OpItemVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OpItemVO.java
new file mode 100644
index 0000000..6d55f16
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OpItemVO.java
@@ -0,0 +1,33 @@
+package com.vci.pagemodel;
+
+/**
+ * 鎿嶄綔瀵硅薄
+ */
+public class OpItemVO extends Object{
+ private String name;
+ private Object value;
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public Object getValue() {
+ return value;
+ }
+ public void setValue(Object value) {
+ this.value = value;
+ }
+ public boolean equals(Object obj) {
+ if (obj != null) {
+ if (((OpItemVO) obj).name == this.name) {
+ return true;
+ }
+ }
+ return false;
+ }
+ public String toString() {
+ return name+" , "+value;
+ }
+
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java
index 382495d..28d14d0 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/OrgDepartmentQueryController.java
@@ -27,6 +27,7 @@
import java.io.IOException;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 閮ㄩ棬鐨勬煡璇㈡帶鍒跺櫒
@@ -196,4 +197,16 @@
}
}
+
+ /**
+ * 鏍规嵁鐢ㄦ埛涓婚敭鑾峰彇鍏宠仈鐨勯儴闂�
+ * @param userOid 鐢ㄦ埛涓婚敭
+ * @param queryMap 鏌ヨ鏉′欢锛屽鏋滈渶瑕佷娇鐢ㄧ敤鎴风殑灞炴�ф潵鏌ヨ鍙互浣跨敤pkUser.xxxx
+ * @return 閮ㄩ棬鐨勬樉绀哄璞�
+ */
+ @RequestMapping(value = "/listDeptByUserOid",method = RequestMethod.GET)
+ public BaseResult listDeptByUserOid(String userOid, Map<String, String> queryMap){
+ List<OrgDepartmentVO> listData=deptQueryService.listDeptByUserOid(userOid, queryMap);
+ return BaseResult.dataList(listData);
+ }
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java
index 4ebd730..b9b5bc3 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java
@@ -181,9 +181,9 @@
* @throws VciBaseException
*/
@RequestMapping(value = "/listUserByUserType",method = RequestMethod.GET)
- public BaseResult<List<SmUserVO>> listUserByUserType() throws VciBaseException{
+ public BaseResult<List<SmUserVO>> listUserByUserType(Integer type) throws VciBaseException{
try {
- List<SmUserVO> smUserVOList = userQueryService.listUserByUserType();
+ List<SmUserVO> smUserVOList = userQueryService.listUserByUserType(type);
return BaseResult.dataList(smUserVOList);
}catch (Exception e){
e.printStackTrace();
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java
index 8f653e9..ff9114b 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/SmUserQueryServiceI.java
@@ -276,5 +276,5 @@
* @return
* @throws VciBaseException
*/
- List<SmUserVO> listUserByUserType() throws PLException;
+ List<SmUserVO> listUserByUserType(Integer type) throws PLException;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
index e51a69d..ea8b652 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmUserQueryServiceImpl.java
@@ -1671,9 +1671,9 @@
* @throws VciBaseException
*/
@Override
- public List<SmUserVO> listUserByUserType() throws PLException {
+ public List<SmUserVO> listUserByUserType(Integer type) throws PLException {
try {
- UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
+ UserInfo[] userInfo = platformClientUtil.getFrameworkService().fetchUserInfoByType(type != null ? type.shortValue() :Short.parseShort(WebUtil.getCurrentUserSessionInfo().getUsertype()));
return userInfoArr2VO(userInfo);
} catch (PLException e) {
throw new VciBaseException("鐧诲綍鏃讹紝鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛�"+e.getMessage());
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsDataAuthController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsDataAuthController.java
index e16819f..976c5c4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsDataAuthController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsDataAuthController.java
@@ -1,6 +1,7 @@
package com.vci.web.controller;
import com.vci.corba.common.PLException;
+import com.vci.corba.framework.data.CheckValue;
import com.vci.corba.framework.data.GrandValue;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.VciBaseUtil;
@@ -84,4 +85,40 @@
return BaseResult.fail(exceptionMessage);
}
}
+
+ /**
+ * 鏌ヨ鎺堟潈缁撴灉
+ * @param params 鏌ヨ瀵硅薄
+ * @return 鎺堟潈缁撴灉
+ */
+ @GetMapping("/authResult")
+ public BaseResult authResult(@RequestBody CheckValue params){
+ try {
+ return osDataAuthServiceI.authResult(params);
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "鏌ヨ鎺堟潈缁撴灉鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 鏌ヨ涓氬姟瀵硅薄
+ * @param btmName 涓氬姟绫诲瀷鍚嶇О
+ * @param boFlag 鏄惁涓篵o绫诲瀷锛宼rue涓篵tm锛宖alse涓簂ink
+ * @param btmType 涓氬姟绫诲瀷
+ * @return 鏌ヨ鍑虹殑鏁版嵁
+ */
+ @GetMapping("/queryBusiness")
+ public BaseResult queryBusiness(String btmName, boolean boFlag, String btmType){
+ try {
+ return osDataAuthServiceI.queryBusiness(btmName, boFlag, btmType);
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "鏌ヨ涓氬姟瀵硅薄鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsDataAuthServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsDataAuthServiceI.java
index e57a2a1..7683e49 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsDataAuthServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsDataAuthServiceI.java
@@ -1,6 +1,7 @@
package com.vci.web.service;
import com.vci.corba.common.PLException;
+import com.vci.corba.framework.data.CheckValue;
import com.vci.corba.framework.data.GrandValue;
import com.vci.starter.web.pagemodel.BaseResult;
@@ -27,4 +28,18 @@
* @return 鍒犻櫎缁撴灉
*/
BaseResult deleteTypeRuleGrand(String typeName, String ruleName) throws PLException;
+ /**
+ * 鏌ヨ鎺堟潈缁撴灉
+ * @param params 鏌ヨ瀵硅薄
+ * @return 鎺堟潈缁撴灉
+ */
+ BaseResult authResult(CheckValue params);
+ /**
+ * 鏌ヨ涓氬姟瀵硅薄
+ * @param btmName 涓氬姟绫诲瀷鍚嶇О
+ * @param boFlag 鏄惁涓篵o绫诲瀷锛宼rue涓篵tm锛宖alse涓簂ink
+ * @param btmType 涓氬姟绫诲瀷
+ * @return 鏌ヨ鍑虹殑鏁版嵁
+ */
+ BaseResult queryBusiness(String btmName, boolean boFlag, String btmType);
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsDataAuthServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsDataAuthServiceImpl.java
index 67f015e..1e0a44f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsDataAuthServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsDataAuthServiceImpl.java
@@ -1,19 +1,28 @@
package com.vci.web.service.impl;
+import com.vci.client.common.oq.OQTool;
+import com.vci.common.qt.object.QueryTemplate;
import com.vci.common.qt.object.Symbol;
import com.vci.constant.IRightConstant;
import com.vci.corba.common.PLException;
+import com.vci.corba.framework.data.CheckValue;
import com.vci.corba.framework.data.GrandValue;
import com.vci.corba.omd.btm.BizType;
+import com.vci.corba.omd.data.AttributeValue;
+import com.vci.corba.omd.data.BusinessObject;
+import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.corba.omd.lcm.TransitionVO;
import com.vci.corba.omd.ltm.LinkType;
import com.vci.corba.portal.data.PLAction;
+import com.vci.dto.AuthResultDTO;
import com.vci.dto.OsDataAuthDTO;
+import com.vci.pagemodel.OpItemVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.web.service.OsDataAuthServiceI;
import com.vci.web.util.PlatformClientUtil;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -89,6 +98,105 @@
}
return BaseResult.success("鍒犻櫎鎴愬姛锛�");
}
+ /**
+ * 鏌ヨ鎺堟潈缁撴灉
+ * @param params 鏌ヨ瀵硅薄
+ * @return 鎺堟潈缁撴灉
+ */
+ @Override
+ public BaseResult authResult(CheckValue params) {
+// CheckValue params = new CheckValue();
+ params.opname = IRightConstant.OPS;
+ if(StringUtils.isBlank(params.objectoid)){
+ params.objectoid = "22385E82-485C-549D-E2F4-91278E9E0A76";
+ }
+ List<String> tableHeaders = new ArrayList<>();
+ List<Object> tableValues = new ArrayList<>();
+ // 鎿嶄綔
+ List<OpItemVO> opitems = new ArrayList<OpItemVO>();
+ try {
+ String where = platformClientUtil.getFrameworkService().checkRight(params);
+ String[] ops = where.split(":");
+ //澶勭悊鍒楄〃澶�
+ for (String s : ops) {
+ if (s != null && !s.equals("")) {
+ OpItemVO item = new OpItemVO();
+ String[] op = s.split(",");
+ item.setName(op[0]);
+ item.setValue(op[1]);
+ tableHeaders.add(op[0]);
+ opitems.add(item);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new VciBaseException("閴存潈鍑洪敊\n"
+ + e.getLocalizedMessage());
+ }
+ //澶勭悊鏁版嵁
+ for (int n = 0; n < opitems.size(); n++) {
+ tableValues.add(opitems.get(n).getValue().equals("1") ? true : false);
+ }
+ AuthResultDTO authResultDTO = new AuthResultDTO();
+ authResultDTO.setTableValues(tableValues);
+ authResultDTO.setTableHeader(tableHeaders);
+ return BaseResult.success(authResultDTO);
+ }
+ /**
+ * 鏌ヨ涓氬姟瀵硅薄
+ * @param btmName 涓氬姟绫诲瀷鍚嶇О
+ * @param boFlag 鏄惁涓篵o绫诲瀷锛宼rue涓篵tm锛宖alse涓簂ink
+ * @param btmType 涓氬姟绫诲瀷
+ * @return 鏌ヨ鍑虹殑鏁版嵁
+ */
+ @Override
+ public BaseResult queryBusiness(String btmName, boolean boFlag, String btmType) {
+ QueryTemplate qt = new QueryTemplate();
+ qt.setBtmType(btmName);
+ List<String> clauseList = new ArrayList<String>();
+ clauseList.add("*");
+ qt.setClauseList(clauseList);
+ qt.setType(btmType);// 閾炬帴link
+ qt.setCondition(null);
+ qt.setId("qt1");
+ List<Object> tableValues = new ArrayList<>();
+ try {
+ clauseList = new ArrayList<>(Arrays.asList(platformClientUtil.getBtmService().getSysAttributeNames()));
+ clauseList.addAll(Arrays.asList(platformClientUtil.getBtmService().getAttributeNames(btmName)));
+
+ if (boFlag) {
+ BusinessObject[] result = platformClientUtil.getQueryService().findBTMObjects(qt.getId(), OQTool.qtTOXMl(qt).asXML());
+ for (int i = 0; i < result.length; i++) {
+ List<Object> lineData = new ArrayList<>();
+ BusinessObject bo = result[i];
+ AttributeValue[] attList = bo.hisAttrValList;
+ for (int j = 0; j < clauseList.size(); j++) {
+ lineData.add(attList[j].attrVal);
+// qrTable.setValueAt(attList[j].attrVal, i, j);
+ }
+ tableValues.add(lineData);
+ }
+ } else {
+ List<Object> lineData = new ArrayList<>();
+ LinkObject[] loResult = platformClientUtil.getQueryService().findLTObjects(qt.getId(), OQTool.qtTOXMl(qt).asXML());
+ for (int i = 0; i < loResult.length; i++) {
+ LinkObject lo = loResult[i];
+ AttributeValue[] attList = lo.hisAttrValList;
+ for (int j = 0; j < attList.length; j++) {
+ lineData.add(attList[j].attrVal);
+// qrTable.setValueAt(attList[j], i, j);
+ }
+ tableValues.add(lineData);
+ }
+ }
+ } catch (PLException e) {
+ e.printStackTrace();
+ }
+ Map<String, Object> resultData = new HashMap<>();
+ resultData.put("tableHeader", clauseList);
+ resultData.put("tableValues", tableValues);
+ return BaseResult.success(resultData);
+ }
//add by caill start 2015 12.18 灏嗘煡璇㈠嚭鏉ョ殑action鏀惧叆鍒癿ap涓�
private Map<String, String> getAllActionsByType2(String typeName, String type) throws PLException {
@@ -142,7 +250,7 @@
Map<Object, Object> columnData = new HashMap<>();
// 澧炲姞椤甸潰缂撳瓨
// ruleModel.setConditionValue(row, rules);
- columnData.put("rules",rules.get(0));
+ columnData.put("rules",rules);
// add by caill start 2015 12.18 灏嗘煡鍑虹殑action鏀惧埌map涓紝娉ㄦ剰涓嶈钀戒笅鈥滄煡璇⑩��
Map<String, String> actionMap = new HashMap<String, String>();
actionMap.put("query", "鏌ヨ"); // 灏嗘搷浣滀腑鐨剄uery鏀惧叆actionMap涓�
@@ -170,15 +278,15 @@
for (int j = 0; j < rules.size(); j++) {
// 瑙勫垯鍚嶅拰绫诲瀷
// ruleModel.setValueAt(rules.get(j).ruleName, row, 0);
- columnData.put(0, rules.get(j).ruleName);
+ columnData.put("0", rules.get(j).ruleName);
if (rules.get(j).ruleType.equals(IRightConstant.RULETYPE__HAS)) {
- columnData.put(1, "鍏佽瑙勫垯");
+ columnData.put("1", "鍏佽瑙勫垯");
} else if (rules.get(j).ruleType.equals(IRightConstant.RULETYPE__NOTHAS)) {
- columnData.put(1, "鎷掔粷瑙勫垯");
+ columnData.put("1", "鎷掔粷瑙勫垯");
} else if (rules.get(j).ruleType.equals(IRightConstant.RULETYPE_ALL_HAS)) {
- columnData.put(1, "鍏ㄩ儴鏈夋潈");
+ columnData.put("1", "鍏ㄩ儴鏈夋潈");
} else {
- columnData.put(1, "鍏ㄩ儴鏃犳潈");
+ columnData.put("1", "鍏ㄩ儴鏃犳潈");
}
// 鎸囧畾鐨勬搷浣滆祴鍊�
// TableColumnModel columnModel = funclet.getRightMainPanel().getRuleTable().getColumnModel();
@@ -209,7 +317,7 @@
// int columnIndex = columnModel.getColumnIndex(op);
if (columnIndex >= 0) {
// ruleModel.setValueAt(rules.get(j).isGrand == '1' ? true : false, row, columnIndex);
- columnData.put(columnIndex, rules.get(j).isGrand == '1' ? true : false);
+ columnData.put(String.valueOf(columnIndex), rules.get(j).isGrand == '1' ? true : false);
}
}
diff --git a/Source/plt-web/plt-web-ui/src/api/authority/ui/dataAuthor.js b/Source/plt-web/plt-web-ui/src/api/authority/ui/dataAuthor.js
index a6b5b23..b0bea7e 100644
--- a/Source/plt-web/plt-web-ui/src/api/authority/ui/dataAuthor.js
+++ b/Source/plt-web/plt-web-ui/src/api/authority/ui/dataAuthor.js
@@ -15,14 +15,23 @@
return request({
url: '/api/dataAuthController/saveGrand',
method: 'post',
- params: params
+ data: params
})
}
// 鍒犻櫎
export function delGrand(params) {
return request({
- url: "/api/dataAuthController/delGrand",
+ url: "/api/dataAuthController/deleteTypeRuleGrand",
method: "delete",
params
})
}
+
+// 鏌ョ湅鎺堟潈缁撴灉
+export function authResult(params) {
+ return request({
+ url: "/api/dataAuthController/authResult",
+ method: "get",
+ params
+ });
+}
diff --git a/Source/plt-web/plt-web-ui/src/api/system/user/api.js b/Source/plt-web/plt-web-ui/src/api/system/user/api.js
index 47b476b..8f40f96 100644
--- a/Source/plt-web/plt-web-ui/src/api/system/user/api.js
+++ b/Source/plt-web/plt-web-ui/src/api/system/user/api.js
@@ -43,6 +43,16 @@
}
});
}
+// 鏌ヨ褰撳墠鐢ㄦ埛鎵�鍦ㄩ儴闂�
+export function listDeptByUserOid(userOid) {
+ return request({
+ url: "/api/departmentQueryController/listDeptByUserOid",
+ method: "get",
+ params:{
+ userOid
+ }
+ });
+}
// 淇濆瓨瑙掕壊
export function saveRights(params) {
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue
index 81f8707..19a7c3b 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-form.vue
@@ -164,7 +164,9 @@
btmName: this.currentDefineVO.btmType,
btmType: this.currentDefineVO.btmType,
formDefineId: this.currentDefineVO.id,
- formDefineOid: this.currentDefineVO.oid
+ formDefineOid: this.currentDefineVO.oid,
+ componentOid: this.componentVO.oid,
+ uiDefineId: this.uiContext,
};
if (this.dataStore[0] && this.dataStore[0].oid) {
formParams.oid = this.dataStore[0].oid;
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue
index 49865da..8a08f85 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue
@@ -405,53 +405,9 @@
departmentQueryController({queryAllLevel: true}).then(res => {
const data = res.data.treeData;
this.departData = this.departDtaFormAtter(data);
- }).catch(err => {
- this.$message.error(err);
})
},
watch: {
- selectRow:{
- handler(val,oldval) {
- this.authData=[];
- if(val && val.rules){
- this.form=JSON.parse(JSON.stringify(val.rules));
- //this.getTemp(true);
- //this.getTemp(false)
- //鏋勫缓鎺堟潈涓讳綋鏁版嵁
- if(val.rules.users){
- val.rules.users.split(',').forEach((item,i)=>{
- if(item){
- this.authData.push({
- name:'{'+item+', '+item+', user}'
- })
- }
- })
- }
- if(val.rules.roles){
- val.rules.roles.split(',').forEach((item,i)=>{
- if(item){
- this.authData.push({
- name:'{'+item+', '+item+', role}'
- })
- }
- })
- }
- if(val.rules.userGroups){
- val.rules.userGroups.split(',').forEach((item,i)=>{
- if(item){
- this.authData.push({
- name:'{'+item+', '+item+', userGroup}'
- })
- }
- })
- }
- }else {
- this.form={};
- }
- },
- immediate: true,
- deep: true
- },
actionMap:{
handler(val) {
this.actionDic=[];
@@ -467,6 +423,67 @@
immediate: true,
deep: true
},
+ selectRow:{
+ handler(val,oldval) {
+ this.authData=[];
+ if(val && val.rules &&val.rules.length>0) {
+ this.form = JSON.parse(JSON.stringify(val.rules[0]));
+ //this.getTemp(true);
+ //this.getTemp(false)
+ //鏋勫缓鎺堟潈涓讳綋鏁版嵁
+ if (val.rules[0].users) {
+ val.rules[0].users.split(',').forEach((item, i) => {
+ if (item) {
+ this.authData.push({
+ name: '{' + item + ', ' + item + ', user}'
+ })
+ }
+ })
+ }
+ if (val.rules[0].roles) {
+ val.rules[0].roles.split(',').forEach((item, i) => {
+ if (item) {
+ this.authData.push({
+ name: '{' + item + ', ' + item + ', role}'
+ })
+ }
+ })
+ }
+ if (val.rules[0].userGroups) {
+ val.rules[0].userGroups.split(',').forEach((item, i) => {
+ if (item) {
+ this.authData.push({
+ name: '{' + item + ', ' + item + ', userGroup}'
+ })
+ }
+ })
+ }
+ //瑙ｆ瀽鎿嶄綔鎸夐挳閫変腑鍊�
+ if (this.actionDic.length > 0) {
+ let actionDicStr = JSON.stringify(this.actionDic);
+ val.rules.forEach(item => {
+ if (item.isGrand == 49) {
+ let identifier = item.identifier.replace(this.btmNode.attributes.name + '_', '')
+ if (actionDicStr.indexOf('"value":"'+identifier+'"}') != -1) {
+ this.actionForm.push(identifier)
+ } else {
+ this.linkactionForm.push(identifier);
+ }
+ }
+ })
+ }
+ }else {
+ this.form={
+ ruleName:'',
+ ruleType:'0'
+ };
+ this.actionForm=[];
+ this.linkactionForm=[];
+ }
+ },
+ immediate: true,
+ deep: true
+ },
},
methods: {
//閫変腑鐢ㄦ埛
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
index 2b0c6fa..54d9cd4 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
@@ -35,7 +35,7 @@
</template>
</avue-crud>
<div style="margin-top: 15px;">
- <data-view key="dataView" :btmNode="nodeRow" :selectRow="selectRow" :actionMap="actionMap" :readOnly="true" :height="clientHeight-260-220"></data-view>
+ <data-view key="dataView" :btmNode="nodeRow" :actionMap="actionMap" :selectRow="selectRow" :readOnly="true" :height="clientHeight-260-220"></data-view>
</div>
<!-- 鏂板 && 缂栬緫 -->
<el-dialog
@@ -47,7 +47,7 @@
width="70%"
@close="addDialogClose">
<div>
- <data-view ref="editView" key="editView" :btmNode="nodeRow" :selectRow="title === 'add'?{}:selectRow" :actionMap="actionMap" :readOnly="false" :height="clientHeight-260"></data-view>
+ <data-view ref="editView" key="editView" :btmNode="nodeRow" :actionMap="actionMap" :selectRow="title === 'add'?{}:selectRow" :readOnly="false" :height="clientHeight-260"></data-view>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="addDialogSavaHandler">淇� 瀛�</el-button>
@@ -57,22 +57,54 @@
<!-- 鏌ョ湅鎺堟潈缁撴灉 -->
<el-dialog
v-dialogDrag
- v-loading="checkViewLoading"
:visible.sync="checkViewVisible"
append-to-body="true"
class="avue-dialog"
title="鏌ョ湅浣跨敤鑼冨洿"
width="60%"
>
- <avue-crud
- ref="checkViewCrud"
- :data="checkViewData"
- :option="checkViewOption"
- @search-change="checkHandleSearch"
- @search-reset="checkHandleReset"
- >
+ <el-form ref="form" :inline="true" size="mini" :model="form" label-width="80px">
+ <el-form-item label="涓氬姟瀵硅薄" prop="btmType">
+ <el-input v-model="form.btmType"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="mini" @click="onSubmit">鏌ヨ涓氬姟瀵硅薄</el-button>
+ </el-form-item>
+ <fieldset style="width: 99.5%">
+ <legend> 鐢ㄦ埛淇℃伅 </legend>
+ <div>
+ <el-form-item label="鐢ㄦ埛">
+ <el-select v-model="form.userOid">
+ <el-option v-for="item in userDic" :label="item.name+'('+item.id+')'" :value="item.oid"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瑙掕壊">
+ <el-select v-model="form.roleOid">
+ <el-option v-for="item in roleDic" :label="item.name" :value="item.oid"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐢ㄦ埛缁�">
+ <el-select v-model="form.deptOid">
+ <el-option v-for="item in deptDic" :label="item.name" :value="item.oid"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ </fieldset>
- </avue-crud>
+ </el-form>
+ <fieldset style="width: 99.5%;margin-top: 10px;">
+ <legend> 鎺堟潈缁撴灉锛� </legend>
+ <div>
+ <avue-crud
+ ref="checkViewCrud"
+ :data="checkViewData"
+ :option="checkViewOption"
+ >
+
+ </avue-crud>
+ </div>
+ </fieldset>
+
</el-dialog>
</basic-container>
</el-main>
@@ -84,9 +116,9 @@
import {getBizTree} from "@/api/UI/uiDefine";
import basicOption from "@/util/basic-option";
import dataView from "./dataView";
-import {getData,saveGrand,delGrand} from "@/api/authority/ui/dataAuthor";
+import {getData,saveGrand,delGrand,authResult} from "@/api/authority/ui/dataAuthor";
+import {listUserByUserType, listRoleByUserOid, listDeptByUserOid} from "@/api/system/user/api";
import func from "@/util/func";
-import {getUsedEnumList} from "@/api/modeling/enumType/api";
export default {
name: "index",
components:{dataView},
@@ -136,7 +168,15 @@
data: [],
title: '',
visible: false,
- form:{},
+ form:{
+ btmType:'',
+ userOid:'',
+ roleOid:'',
+ deptOid:''
+ },
+ userDic:[],
+ roleDic:[],
+ deptDic:[],
actionMap:{},
switchDic:[{
label:'',
@@ -144,11 +184,45 @@
},{
label:'',
value:true
- }]
+ }],
+ checkViewVisible:false,
+
}
},
created() {
this.getTreeList();
+ },
+ watch:{
+ 'form.userOid':{
+ handler(val) {
+ if(val){
+ listRoleByUserOid(val).then(res => {
+ // 缁勮濂界┛姊鍙敤鏁版嵁
+ this.roleDic = res.data.data;
+ if(this.roleDic.length>0){
+ this.form.roleOid=this.roleDic[0].oid
+ }else{
+ this.form.roleOid=''
+ }
+ })
+ listDeptByUserOid(val).then(res => {
+ this.deptDic = res.data.data;
+ if(this.deptDic.length>0){
+ this.form.deptOid=this.deptDic[0].oid
+ }else {
+ this.form.deptOid='';
+ }
+ })
+ }else{
+ this.roleDic=[];
+ this.deptDic=[];
+ this.form.roleOid=''
+ this.form.deptOid='';
+ }
+ },
+ immediate: true,
+ deep: true
+ }
},
methods: {
//鏍戣〃鏌ヨ
@@ -199,10 +273,9 @@
})
}
this.data = res.data.obj.rowList;
- this.$refs.crud.clearSelection();
this.tableLoading = false;
this.actionMap=res.data.obj.actionMap;
- this.selectRow={}
+ this.$refs.crud.setCurrentRow( );
})
},
handleRefresh() {
@@ -211,38 +284,6 @@
// 琛岀偣鍑�
rowClickHandler(row) {
this.selectRow=row
- },
- // 鏌ョ湅鎺堟潈缁撴灉
- chekView() {
- if (this.selectRow=={}) {
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�');
- return;
- }
-
- getUsedEnumList({enumName: this.selectRow.id}).then(res => {
- if (res.data.code === 200) {
- this.checkViewVisible = true;
- this.checkViewData = res.data.data;
- this.checkViewDataSearch = res.data.data;
- }
- })
- },
-
- // 鏌ョ湅鎺堟潈缁撴灉鏌ヨ
- checkHandleSearch(params, done) {
- const {source} = params;
-
- if (!params.source) {
- this.checkViewData = this.checkViewDataSearch;
- return done();
- }
-
- this.checkViewData = this.checkViewData.filter(item => {
- return item.source && item.source.includes(source);
- });
-
- done();
-
},
//鍒涘缓
addHandler(){
@@ -264,31 +305,45 @@
},
// 鏂板缂栬緫淇濆瓨
addDialogSavaHandler() {
- let form=this.$refs.editView.form;
- form.users=''
- form.userGroups='';
- form.roles=''
- this.$refs.editView.authData.forEach(item=>{
- let infos=item.name.split(', ');
- infos[0]=infos[0].replace('{','')
- if(infos[2]=='user}'){
- form.users+=infos[0]+','
+ let form = this.$refs.editView.form;
+ if (form.ruleName == '') {
+ this.$message.error('瀹綋璇疯緭鍏ヨ鍒欏悕绉�');
+ return;
+ }
+ form.users = ''
+ form.userGroups = '';
+ form.roles = ''
+ this.$refs.editView.authData.forEach(item => {
+ let infos = item.name.split(', ');
+ infos[0] = infos[0].replace('{', '')
+ if (infos[2] == 'user}') {
+ form.users += infos[0] + ','
}
- if(infos[2]=='userGroup}'){
- form.userGroups+=infos[0]+','
+ if (infos[2] == 'userGroup}') {
+ form.userGroups += infos[0] + ','
}
- if(infos[2]=='role}'){
- form.roles+=infos[0]+','
+ if (infos[2] == 'role}') {
+ form.roles += infos[0] + ','
}
});
- console.log(form)
- //saveGrand(this.viewData).then(res => {
- //if (res.data.code === 200) {
- //this.$message.success(res.data.obj);
+ let data = [];
+ for (var i in this.actionMap) {
+ data.push({
+ ...form,
+ identifier: this.nodeRow.attributes.name + '_' + this.actionMap[i],
+ isGrand: this.$refs.editView.actionForm.some(item => {
+ return item == this.actionMap[i]
+ }) ? 49 : 48
+ })
+ }
+
+ saveGrand(data).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
this.getTableList();
this.addDialogClose();
- //}
- //})
+ }
+ })
},
// 鏂板缂栬緫瀵硅瘽妗嗗彇娑�
addDialogClose() {
@@ -305,7 +360,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- delGrand({name:this.templateForm}).then(res => {
+ delGrand({typeName:this.nodeRow.attributes.name,ruleName:this.selectRow.rules[0].ruleName}).then(res => {
if (res.data.code === 200) {
this.$message.success(res.data.obj);
this.getTableList();
@@ -318,9 +373,29 @@
});
});
},
- // 鏌ョ湅浣跨敤鑼冨洿閲嶇疆
- checkHandleReset() {
- this.checkViewData = this.checkViewDataSearch;
+
+ // 鏌ョ湅鎺堟潈缁撴灉
+ chekView() {
+ if (func.isEmptyObject(this.nodeRow)) {
+ this.$message.warning('璇烽�夋嫨绫诲瀷鏍戜俊鎭�');
+ return;
+ }
+ this.checkViewVisible = true;
+ listUserByUserType({type:1}).then(res => {
+ // 缁勮濂界┛姊鍙敤鏁版嵁
+ this.userDic = res.data.data;
+ if(this.userDic.length>0){
+ this.form.userOid=this.userDic[0].oid
+ }else{
+ this.form.userOid=''
+ }
+ })
+
+ authResult({biztype: this.nodeRow.attributes.name,objectoid:''}).then(res => {
+ if (res.data.code === 200) {
+ this.checkViewData = res.data.data;
+ }
+ })
},
}
}
@@ -332,5 +407,9 @@
overflow: auto !important;
}
}
-
+fieldset {
+ padding: 10px 6px;
+ margin: 0;
+ border: 1px solid #EBEEF5;
+}
</style>
--
Gitblit v1.9.3