Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

 Source/UBCS-WEB/src/components/Master/MasterTransfer.vue

@@ -119,14 +119,18 @@
          this.$message.warning('请选择要导出的模板')
        }else {
          const selectList=[]
          let exportArr=[]
          let exportArr={}
          const ids = this.selectRow.map(item => item.oid).join(',')
          this.selectRow.forEach(item=>{
            selectList.push(
             item.oid
            )
          })
          exportArr=this.value.map(index => this.tableHeadData[index].prop);
          exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':selectList,'attrIdIndexMap[index]':exportArr}).then(res=>{
          //已选择属性
          this.value.map(index => this.tableHeadData[index].prop).forEach((item, index) => {
            exportArr[`attrIdIndexMap[${index}]`] = item
          })
          exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':ids,...exportArr}).then(res=>{
            console.log(res)
          })
        }

 Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue

@@ -28,12 +28,12 @@
    },
    watch:{
        referConfigOption (){
          console.log(111)
            if(func.notEmpty(this.referConfigOption.referConfig) || func.notEmpty(this.referConfigOption.referBtmId)){
                this.openReconfigInterFace(this.referConfigOption);
            }else{
                this.openTipsChooseOrCust();
            }

        },
    },
    methods: {

 Source/UBCS-WEB/src/views/system/menu.vue

@@ -232,11 +232,11 @@
              dicData: [
                {
                  label: "否",
                  value: false
                  value: "false"
                },
                {
                  label: "是",
                  value: true
                  value: "true"
                }
              ],
              hide: true

 Source/UBCS-WEB/vue.config.js

@@ -26,10 +26,10 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        target: 'http://localhost:37000',
        // target: 'http://localhost:37000',
        // target: 'http://192.168.1.51:37000',
        // target: 'http://192.168.1.46:37000',
        // target: 'http://dev.vci-tech.com:37000',
        target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.51:37000/',
        // target: 'http://192.168.1.104:37000',
        // target: 'http://192.168.1.63:37000',

 Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/entity/Menu.java

@@ -118,6 +118,12 @@
    private String remark;

    /**
     * 是否缓存
     */
    @ApiModelProperty(value = "是否缓存")
    private String keepAlive;

    /**
     * 是否已删除
     */
    @TableLogic

 Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/vo/MenuVO.java

@@ -21,11 +21,13 @@
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.vci.ubcs.system.entity.Menu;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tool.node.INode;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

/**
@@ -90,4 +92,8 @@
     * 是否新窗口打开
     */
    private String isOpenName;
    /**
     * 前端是否隐藏
     */
    private HashMap<String,Boolean> meta = new HashMap<>();
}

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java

@@ -180,8 +180,9 @@
    @ApiOperationSupport(order = 8)
    @ApiOperation(value = "前端菜单数据", notes = "前端菜单数据")
    public R<List<MenuVO>> routes(BladeUser user, Long topMenuId) {
        List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
        return R.data(list);
        List<MenuVO> lists = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
        menuService.handleKeepAlive(lists);
        return R.data(lists);
    }

    /**

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/IMenuService.java

@@ -174,4 +174,12 @@
     */
    List<Menu> getMenuButtonByType(String btmType);

    /**
     * 对KeepAlive值转换成布尔类型进行封装
     *
     * @param childMenu
     * @return
     */
    void handleKeepAlive(List<MenuVO> childMenu);

}

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java

@@ -303,4 +303,20 @@
        return baseMapper.selectMenuChildByBtnType(btmType);
    }

    /**
     * 对KeepAlive值转换成布尔类型进行封装
     *
     * @param childMenu
     * @return
     */
    @Override
    public void handleKeepAlive(List<MenuVO> childMenu) {
        childMenu.forEach(list->{
            list.getMeta().put("keepAlive","true".equals(list.getKeepAlive()));
            if(list.getChildren().size()>0){
                handleKeepAlive(list.getChildren());
            }
        });
    }

}