Merge remote-tracking branch 'origin/master'

 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;

}

 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;
    }

}

 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);
    }
}

 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();

 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;
}

 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());

 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 æ˜¯å¦ä¸ºbo类型，true为btm，false为link
     * @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);
        }
    }
}

 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 æ˜¯å¦ä¸ºbo类型，true为btm，false为link
     * @param btmType ä¸šåŠ¡ç±»åž‹
     * @return æŸ¥è¯¢å‡ºçš„数据
     */
    BaseResult queryBusiness(String btmName, boolean boFlag, String btmType);
}

 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 æ˜¯å¦ä¸ºbo类型，true为btm，false为link
     * @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放入到map中
    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", "查询"); // å°†æ“ä½œä¸­çš„query放入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);
                }

            }

 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
  });
}

 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) {

 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;

 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: {
    //选中用户

 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%"
        >
          <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>&nbsp;用户信息 </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>

          </el-form>
          <fieldset style="width: 99.5%;margin-top: 10px;">
            <legend>&nbsp;授权结果： </legend>
            <div>
          <avue-crud
            ref="checkViewCrud"
            :data="checkViewData"
            :option="checkViewOption"
            @search-change="checkHandleSearch"
            @search-reset="checkHandleReset"
          >

          </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(){
@@ -265,6 +306,10 @@
    // æ–°å¢žç¼–辑保存
    addDialogSavaHandler() {
      let form=this.$refs.editView.form;
      if (form.ruleName == '') {
        this.$message.error('客体请输入规则名称');
        return;
      }
      form.users=''
      form.userGroups='';
      form.roles=''
@@ -281,14 +326,24 @@
          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>