添加任务编排功能代码及修复测试bug

Hos-resource/src/main/java/com/yihu/ehr/crawler/controller/CrawlerController.java

@@ -46,9 +46,10 @@ public class CrawlerController {
   任务编排数据映射
    */
    @RequestMapping("jobDataMapping")
    public String jobDataMapping(Model model, String jobId) {
    public String jobDataMapping(Model model, Integer versionId,String datasetIdStr) {
        try {
            model.addAttribute("versionId",versionId);
            model.addAttribute("datasetIdStr",datasetIdStr);
            model.addAttribute("contentPage", "/crawler/dataMapping");
            return "pageView";
        } catch (Exception ex) {
@@ -58,10 +59,10 @@ public class CrawlerController {
    }
    @RequestMapping("datasetDetail")
    public String datasetDetail(Model model,Integer schemeId,String schemeNm,String version,String checkedRowsIndex) {
    public String datasetDetail(Model model,Integer schemeId,String schemeNm,String checkedRowsIndex,String versionId) {
        model.addAttribute("contentPage", "/crawler/datasetDetail");
        model.addAttribute("schemeId",schemeId);
        model.addAttribute("version",version);
        model.addAttribute("versionId",versionId);
        model.addAttribute("schemeNm",schemeNm);
        model.addAttribute("checkedRowsIndex",checkedRowsIndex);
        return "pageView";
@@ -154,7 +155,7 @@ public class CrawlerController {
            @RequestParam(value = "datasetIdStr", required = false) String datasetIdStr
    ) {
        try {
            return crawlerService.getRelations(versionId,datasetIdStr);
            return crawlerService.getRelations(versionId, datasetIdStr);
        } catch (Exception e) {
            e.printStackTrace();
            return null;

Hos-resource/src/main/java/com/yihu/ehr/crawler/dao/CrawlerDatasetDao.java

@@ -5,6 +5,7 @@ import com.yihu.ehr.framework.common.dao.SQLGeneralDAO;
import org.hibernate.Query;
import org.springframework.stereotype.Repository;
import java.math.BigInteger;
import java.util.List;
/**
@@ -26,4 +27,14 @@ public class CrawlerDatasetDao extends SQLGeneralDAO {
        query.setInteger("scheme_version_id", versionId);
        query.executeUpdate();
    }
    public Integer getTotalRows() throws Exception {
        String countSql = "SELECT COUNT(*) FROM (SELECT a.scheme_id, a.scheme_version_id, GROUP_CONCAT(a.dataset_id SEPARATOR ',') AS datasetId, GROUP_CONCAT(a.dataset_name SEPARATOR ',') AS datasetName" +
                "  FROM crawler_dataset a " +
                "  GROUP BY a.scheme_id, a.scheme_version_id ) b WHERE 1= 1";
        Query query = getCurrentSession().createSQLQuery(countSql);
        List<BigInteger> list = query.list();
        int count = list.get(0).intValue();
        return count;
    }
}

Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerService.java

@@ -20,6 +20,7 @@ import com.yihu.ehr.standard.service.adapter.AdapterSchemeVersionService;
import com.yihu.ehr.standard.service.bo.AdapterVersion;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -57,10 +58,10 @@ public class CrawlerService {
        JSONObject root = JSONObject.fromObject(json);
        JSONArray jsonList = root.getJSONArray("lines");
        JSONArray entrances = root.getJSONArray("entrances");
        AdapterSchemeVersionModel versionModel = adapterSchemeVersionService.getByVersion(version);
        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(version));
        if (jsonList != null && jsonList.size() > 0) {
            // 删除旧关联关系
            crawlerDatasetDao.deleteCrawlerDatasetList(versionModel.getId());
            crawlerFlowDao.deleteCrawlerFlowList(versionModel.getId());
            for (Object item : jsonList) {
                JSONObject obj = JSONObject.fromObject(item);
                String from = obj.getString("from");
@@ -106,29 +107,38 @@ public class CrawlerService {
        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(schemeVersionId);
        //获取适配数据集总和
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("name", datasetName);
        List<AdapterDatasetModel> adapterDatasetModelList = adapterDatasetService.getDatasetList(AdapterDatasetModel.class, versionModel.getVersion(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        String condition=null;
        if (datasetName!=null && !"".equals(datasetName)){
            map.put("name", datasetName);
            condition=net.sf.json.JSONObject.fromObject(map).toString();
        }
        List<AdapterDatasetModel> adapterDatasetModelList = adapterDatasetService.getDatasetList(AdapterDatasetModel.class, versionModel.getVersion(), condition, null, null, null);
        //获取编排数据集
        List<CrawlerDataSetModel> crawlerDataset = crawlerDatasetDao.getCrawlerDatasetList(versionModel.getId());
        DetailModelResult re = new DetailModelResult();
        List<CrawlerDatasetResultDetailModel> list = new ArrayList<>();
        for (AdapterDatasetModel datasetModel : adapterDatasetModelList) {
            CrawlerDatasetResultDetailModel obj = new CrawlerDatasetResultDetailModel();
            obj.setSchemeVersionId(schemeVersionId);
            obj.setDatasetId(datasetModel.getStdDatasetId());
            obj.setDatasetCode(datasetModel.getStdDatasetCode());
            obj.setDatasetName(datasetModel.getStdDatasetName());
            obj.setSchemeId(datasetModel.getSchemeId());
            if (crawlerDataset != null && crawlerDataset.size() > 0) {
                for (CrawlerDataSetModel cDataSet : crawlerDataset) {
                    if (cDataSet.getDatasetId().equals(datasetModel.getAdapterDatasetId())) {
                        obj.setSchemeVersionId(cDataSet.getSchemeVersionId());
                        obj.setChecked("1");
                        break;
            if (!StringUtil.isStrEmpty(datasetModel.getAdapterDatasetCode())){
                List<AdapterMetadataModel> metadatas = adapterMetadataService.getAdapterMetadataByDataset(versionModel.getVersion(), datasetModel.getId());
            if (metadatas != null && metadatas.size() > 0) {
                CrawlerDatasetResultDetailModel obj = new CrawlerDatasetResultDetailModel();
                obj.setSchemeVersionId(schemeVersionId);
                obj.setDatasetId(datasetModel.getId());
                obj.setDatasetCode(datasetModel.getStdDatasetCode());
                obj.setDatasetName(datasetModel.getStdDatasetName());
                obj.setSchemeId(datasetModel.getSchemeId());
                if (crawlerDataset != null && crawlerDataset.size() > 0) {
                    for (CrawlerDataSetModel cDataSet : crawlerDataset) {
                        if (cDataSet.getDatasetId().equals(datasetModel.getId())) {
                            obj.setSchemeVersionId(cDataSet.getSchemeVersionId());
                            obj.setChecked("1");
                            break;
                        }
                    }
                }
                list.add(obj);
            }
            list.add(obj);
        }
        }
        re.setDetailModelList(list);
@@ -149,32 +159,46 @@ public class CrawlerService {
        for (Object item : jsonList) {
            JSONObject obj = JSONObject.fromObject(item);
            String schemeId = obj.getString("schemeId");
            String version = obj.getString("version");
            AdapterSchemeVersionModel versionModel = adapterSchemeVersionService.getByVersion(version);
            String versionId = obj.getString("versionId");
            AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(versionId));
            AdapterVersion adapterVersion = new AdapterVersion(versionModel.getVersion());
            //删除已存在的数据集
            crawlerDatasetDao.deleteCrawlerDatasetList(versionModel.getId());
            JSONArray dataSets = obj.getJSONArray("dataSets");
            //重新存入数据集
            for (Object o : dataSets) {
                JSONObject dataSet = JSONObject.fromObject(o);
                String datasetId = dataSet.getString("datasetId");
                String datasetCode = dataSet.getString("datasetCode");
                String datasetName = dataSet.getString("datasetName");
                CrawlerDataSetModel dataSetModel = new CrawlerDataSetModel();
                dataSetModel.setSchemeVersionId(versionModel.getId());
                dataSetModel.setSchemeId(Integer.valueOf(schemeId));
                dataSetModel.setDatasetId(Integer.valueOf(datasetId));
                dataSetModel.setDatasetCode(datasetCode);
                dataSetModel.setDatasetName(datasetName);
                crawlerDatasetDao.saveEntity(dataSetModel);
            List<AdapterDatasetModel> adapterDatasetModelList = new ArrayList<>();
            //根据id字符串获取编排数据集
            if (obj.containsKey("dataSets")) {
                List<Integer> newDatasetIdList = new ArrayList<>();
                String dataSetStr = obj.getString("dataSets");
                if (StringUtils.isNotBlank(dataSetStr)) {
                    String[] IdList =  dataSetStr.split(",");
                    for (String aIdList : IdList) {
                        if (!Objects.equals(aIdList, "")) {
                            Integer DaSetId = Integer.valueOf(aIdList);
                            newDatasetIdList.add(DaSetId);
                        }
                    }
                }
                adapterDatasetModelList = adapterDatasetService.getListByAdapterDatasetIdList(adapterVersion, newDatasetIdList);
                for (AdapterDatasetModel model : adapterDatasetModelList) {
                    CrawlerDataSetModel dataSetModel = new CrawlerDataSetModel();
                    dataSetModel.setSchemeId(Integer.valueOf(schemeId));
                    dataSetModel.setSchemeVersionId(versionModel.getId());
                    dataSetModel.setDatasetId(model.getId());
                    dataSetModel.setDatasetCode(model.getStdDatasetCode());
                    dataSetModel.setDatasetName(model.getStdDatasetName());
                    crawlerDatasetDao.saveEntity(dataSetModel);
                }
            }
            //如果存在编排映射关系，进行保存操作
            //如果保存传入编排映射关系，进行保存操作
            if (obj.containsKey("relation") && !Objects.equals(obj.getString("relation"), "")) {
                 saveDataSetRelation(version,json);
                saveDataSetRelation(versionId,obj.getString("relation"));
            }
        }
    }
    public List<FlowEntrance> getFlowEntrances(Integer schemeVersionId) {
        List<FlowEntrance> entrances = new ArrayList<>();
        List<CrawlerFlowHeadModel> modelList = crawlerFlowHeadDao.getCrawlerFlowHeadList(schemeVersionId);
@@ -202,13 +226,14 @@ public class CrawlerService {
    }
    /**
     * 删除编排数据
     * @param version
     */
    @Transactional
    public String  deleteJobData(String version) {
        AdapterSchemeVersionModel versionModel =  adapterSchemeVersionService.getByVersion(version);
        AdapterSchemeVersionModel versionModel = (AdapterSchemeVersionModel) adapterSchemeVersionService.get(Integer.valueOf(version));
        if (versionModel == null || versionModel.getId() == null) {
            return "删除失败";
        }
@@ -234,9 +259,9 @@ public class CrawlerService {
    public DetailModelResult getDataSetResult(Integer limit, Integer offset){
        try {
            StringBuffer stringBuffer = new StringBuffer();
            String sql = "SELECT a.scheme_id, a.scheme_version_id, GROUP_CONCAT(a.dataset_id SEPARATOR ';') AS datasetId, GROUP_CONCAT(a.dataset_name SEPARATOR ';') AS datasetName" +
                    " FROM ( SELECT scheme_id, scheme_version_id, CONCAT(dataset_id) AS dataset_id, CONCAT( dataset_code, ',', dataset_name ) AS dataset_name FROM crawler_dataset ) a" +
                    " GROUP BY a.scheme_id, a.scheme_version_id";
            String sql = "SELECT a.scheme_id, a.scheme_version_id, GROUP_CONCAT(a.dataset_id SEPARATOR ',') AS datasetId, GROUP_CONCAT(a.dataset_name SEPARATOR ',') AS datasetName" +
                    " FROM crawler_dataset a " +
                    " GROUP BY a.scheme_id, a.scheme_version_id ";
            stringBuffer.append(sql);
            if (limit != null && offset != null) {
                if (limit > 0 && offset > 0) {
@@ -245,9 +270,12 @@ public class CrawlerService {
            }
            stringBuffer.append(" ;");
            Integer total = crawlerDatasetDao.getTotalRows();
            List list = crawlerDatasetDao.queryListBySql(stringBuffer.toString());
            DetailModelResult detailModelResult = DetailModelResult.success("获取数据集成功");
            detailModelResult.setDetailModelList(list);
            detailModelResult.setTotalCount(total);
            return detailModelResult;
        } catch (Exception e) {
            e.printStackTrace();
@@ -255,6 +283,8 @@ public class CrawlerService {
        }
    }
    /**
     * 获取编排已选择的适配数据集
     *
@@ -285,20 +315,20 @@ public class CrawlerService {
        List<CrawlerDataSetModel> crawlerDataset = crawlerDatasetDao.getCrawlerDatasetList(versionModel.getId());
        List<MappingDataset> list = new ArrayList<>();
        for (AdapterDatasetModel datasetModel : adapterDatasetModelList) {
            MappingDataset obj = new MappingDataset();
            if (crawlerDataset != null && crawlerDataset.size() > 0) {
                for (CrawlerDataSetModel cDataSet : crawlerDataset) {
                    if (cDataSet.getDatasetId().equals(datasetModel.getAdapterDatasetId())) {
//            if (crawlerDataset != null && crawlerDataset.size() > 0) {
                MappingDataset obj = new MappingDataset();
//                for (CrawlerDataSetModel cDataSet : crawlerDataset) {
                    if ( !StringUtil.isStrEmpty(datasetModel.getAdapterDatasetCode())) {
                        List<MappingMetadata> metadatas = getMappingMetaDatasByDataset(versionModel.getVersion(), datasetModel.getAdapterDatasetId());
                        obj.setId(datasetModel.getStdDatasetId());
                        obj.setCode(datasetModel.getStdDatasetCode());
                        obj.setName(datasetModel.getStdDatasetName());
                        obj.setData(metadatas);
                        break;
//                        break;
                    }
                }
            }
            list.add(obj);
//                }
                list.add(obj);
//            }
        }
        return list;
    }
@@ -312,14 +342,17 @@ public class CrawlerService {
     */
    public List<MappingMetadata> getMappingMetaDatasByDataset(String adapterVersion, Integer dataSetId) {
        List<AdapterMetadataModel> adapterMetadataModels = adapterMetadataService.getAdapterMetadataByDataset(adapterVersion, dataSetId);
        AdapterDatasetModel  adapterDatasetModel= adapterMetadataService.getAdapterMetadata(adapterVersion, dataSetId);
        List<MappingMetadata> resultList = new ArrayList<>();
        if (adapterMetadataModels != null && adapterMetadataModels.size() > 0) {
            for (AdapterMetadataModel metadataModel : adapterMetadataModels) {
                MappingMetadata metadata = new MappingMetadata();
                metadata.setId(metadataModel.getAdapterMetadataId());
                metadata.setCode(metadataModel.getAdapterMetadataCode());
                metadata.setName(metadataModel.getAdapterMetadataName());
                resultList.add(metadata);
                if(!StringUtil.isStrEmpty( metadataModel.getAdapterMetadataCode())){
                    MappingMetadata metadata = new MappingMetadata();
                    metadata.setId(metadataModel.getAdapterMetadataId());
                    metadata.setCode(adapterDatasetModel.getAdapterDatasetCode()+"-"+metadataModel.getAdapterMetadataCode());
                    metadata.setName(metadataModel.getAdapterMetadataName());
                    resultList.add(metadata);
                }
            }
        }
        return resultList;

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterDatasetService.java

@@ -453,7 +453,7 @@ public class AdapterDatasetService extends SQLGeneralDAO {
                return null;
            }
            SqlCreator sqlCreator = new SqlCreator(AdapterDatasetModel.class);
            sqlCreator.inCondition("adapterDatasetId", datasetIdList);
            sqlCreator.inCondition("id", datasetIdList);
            String sql = sqlCreator.selectData(adapterVersion.getDataSetTableName());
            Query query = getQuery(sqlCreator, sql);
            return query.list();

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterMetadataService.java

@@ -385,9 +385,16 @@ public class AdapterMetadataService extends SQLGeneralDAO {
    public List getAdapterMetadataByDataset(String adapterVersion,Integer datasetId){
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("adapterDatasetId", datasetId);
        String tableName="adapter_dataset_"+adapterVersion;
        String tableName="adapter_metadata_"+adapterVersion;
        List<AdapterMetadataModel> metadataModelList = getList(AdapterMetadataModel.class,tableName,  net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
        return metadataModelList;
    }
    public AdapterDatasetModel getAdapterMetadata(String adapterVersion,Integer datasetId){
        Map<String,Object> map = new HashMap<String,Object>();
        map.put("id", datasetId);
        String tableName="adapter_dataset_"+adapterVersion;
        AdapterDatasetModel datasetModel= (AdapterDatasetModel)get(AdapterDatasetModel.class,tableName,  datasetId);
        return datasetModel;
    }
}

Hos-resource/src/main/java/com/yihu/ehr/standard/service/adapter/AdapterSchemeService.java

@@ -290,11 +290,13 @@ public class AdapterSchemeService extends SQLGeneralDAO {
            query = getCurrentSession().createQuery(adapterVersionHql);
            query.setParameter("schemeId", schemeModel.getId());
            List<AdapterSchemeVersionModel> versionModelList = query.list();
            AdapterSchemeResultModel resultDetailModel = new AdapterSchemeResultModel();
            resultDetailModel.setSchemeId(schemeModel.getId());
            resultDetailModel.setName(schemeModel.getName());
            resultDetailModel.setVersionList(versionModelList);
            schemeList.add(resultDetailModel);
            if(versionModelList.size()>0){
                AdapterSchemeResultModel resultDetailModel = new AdapterSchemeResultModel();
                resultDetailModel.setSchemeId(schemeModel.getId());
                resultDetailModel.setName(schemeModel.getName());
                resultDetailModel.setVersionList(versionModelList);
                schemeList.add(resultDetailModel);
            }
        }
        result.setDetailModelList(schemeList);
        return result;

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/crawler/dataMappingJs.jsp

@@ -10,15 +10,37 @@
<script>
    (function(win,$) {
        //getMappingRelation
        $('#main').tableViewer(remoteData);
        var checkRowObjs = $(parent.jobLayout.grid.getCheckedRowObjs()).find(".mapping");
        var mappingData = window.top.jQuery.data( checkRowObjs[0], "initData");
        if(mappingData){
            $('#main').tableViewer(JSON.parse(mappingData))
        }else{
            $.ajax({
                url: "${contextRoot}/crawler/getRelations",
                type: "post",
                dataType: "json",
                data:{versionId: "${versionId}",datasetIdStr:"${datasetIdStr}"},
                success: function (data) {
                    debugger
                    if(data){
                        $('#main').tableViewer(JSON.parse(data))
                    }
                }
            });
        }
        $("#btn_close").click(function () {
           // JSON.stringify($.TableView.curTV.getResult())
            parent.jobLayout.dialog.close();
        });
        $("#btn_save").click(function () {
            $.TableView.curTV.data.rels = $.TableView.curTV.getResult().lines;
            window.top.jQuery.data( checkRowObjs[0], "initData",  JSON.stringify($.TableView.curTV.data));
            window.top.jQuery.data( checkRowObjs[0], "mappingData",  JSON.stringify($.TableView.curTV.getResult()));
            parent.jobLayout.dialog.close();
        });
    })(window, jQuery);
</script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/crawler/datasetDetailJs.jsp

@@ -11,7 +11,6 @@
  (function ($, win) {
      var jobDataset = {};
      var Util = $.Util;
      debugger
      var schemeId = '${schemeId}';
      var checkedRowsIndex = '${checkedRowsIndex}'==""?[]:JSON.parse('${checkedRowsIndex}');
      //数据集处理
@@ -21,25 +20,32 @@
        init: function () {
            if(this.grid)
                return;
               var me = this;
            this.$searchNm.ligerSearch({onClick: function (value) {
                alert(1)
                return false;
                var values = {
                    datasetId:parentId,
                    dictId:parentId,
                    stdVersion:$("#version").val(),
                    condition: JSON.stringify({"name":searchNmEntry})
                };
                this.grid.setOptions({parms: values});
                //重新查询
                this.grid.loadData(true);
                var l_grid1 = $("#div_dataset_grid .l-grid1 .l-grid-body-table");
                var l_grid2 = $("#div_dataset_grid .l-grid2 .l-grid-body-table");
                var tr1 = l_grid1.find("tr");
                var tr2 = l_grid2.find("tr");
                if(Util.isStrEmpty(value)) {
                    $('tr',l_grid1).show();
                    $('tr',l_grid2).show();
                    return false;
                }
                $('tr',l_grid1).hide();
                $('tr',l_grid2).hide();
                tr2.each(function(index,element){
                    var td = $(this).find("td").find("div").eq(2);
                    if(td.html().indexOf(value)>=0){
                        td.closest('tr').show();
                        tr1.eq(index).show();
                    }
                });
            }});
            this.grid = $("#div_dataset_grid").ligerGrid({
                url: '${contextRoot}/crawler/getSchemeDataSets',
                parms:{versionId:"${version}"},
                parms:{versionId:"${versionId}"},
                method: 'get',
                checkbox: true,
                width:560,
                height:400,
@@ -49,17 +55,23 @@
                    {display:'数据集编码',name:'datasetCode', width: '50%'},
                    {display:'数据集名称',name:'datasetName',width: '50%'}
                ],
                onAfterShowData: function (gridData) {//显示完数据事件
                    var checkRowsList = jobDataset.attr.grid.getCheckedRows();
                        if(gridData.detailModelList.length==checkRowsList.length){
                            $(".l-grid1 .l-grid-header-table tr").eq(0).addClass("l-checked");
                        }
                },
                //默认选中
                isChecked:function(row){
                    debugger
                    if(checkedRowsIndex.length>0){
                        if(row.__index == checkedRowsIndex[row.__index].index){
                            return true;
                        }else{
                            return false;
                    if(checkedRowsIndex!=null && checkedRowsIndex.length>0){
                        for(var i=0;i<checkedRowsIndex.length;i++){
                            if(row.__index == checkedRowsIndex[i].index){
                                return true;
                            }
                        }
                        return false;
                    }
                    if(checkedRowsIndex.length==0){
                    if(checkedRowsIndex.length==0 || checkedRowsIndex==null){
                        if(row.checked=="1")
                        {
                            return true;
@@ -73,6 +85,16 @@
                //选中修改值
                onCheckRow:function(checked,data,rowid,rowdata)
                {
                    var checkRowsList = jobDataset.attr.grid.getCheckedRows();
                    checkedRowsIndex = null;
                    if(jobDataset.attr.grid.data.detailModelList.length==checkRowsList.length){
                        $(".l-grid1 .l-grid-header-table tr").eq(0).addClass("l-checked");
                    }else{
                        $(".l-grid1 .l-grid-header-table tr").eq(0).removeClass("l-checked");
                    }
                    for(var  i=0;i<checkRowsList.length;i++){
                        checkedRowsIndex.push({index:checkRowsList[i].__index,datasetId:checkRowsList[i].datasetId});//缓存勾选的记录索引
                    }
                    //修改行checked值
                    if(checked)
                        data.checked ="1";
@@ -89,17 +111,16 @@
          $("#btn_save").click(function () {
                var checkRowsList = jobDataset.attr.grid.getCheckedRows();
                var checkRowObjs = $(parent.jobLayout.grid.getCheckedRowObjs()).find(".sel-dataset-name");
                var datasetList = [];
                var datasetName = "";
                var dataSets = "";
                var  checkedRowsIndex = [];
                for(var  i=0;i<checkRowsList.length;i++){
                      datasetName += checkRowsList[i].datasetName+",";
                      var row =  {datasetId: checkRowsList[i].datasetId, datasetCode: checkRowsList[i].datasetCode, datasetName: checkRowsList[i].datasetName};
                      datasetList.push(row);
                    checkedRowsIndex.push({index:checkRowsList[i].__index});
                      datasetName += checkRowsList[i].datasetName+",";//数据集名称
                      dataSets+=checkRowsList[i].datasetId+",";//数据集ID
                      checkedRowsIndex.push({index:checkRowsList[i].__index});//缓存勾选的记录索引
                }
              checkRowObjs.val(datasetName.toString().substring(0,datasetName.length-1));
              window.top.jQuery.data( checkRowObjs[0], "dataSets", {"dataSets":datasetList});
              window.top.jQuery.data( checkRowObjs[0], "dataSets",dataSets);
              window.top.jQuery.data( checkRowObjs[0], "checkedRowsIndex", checkedRowsIndex);
              parent.jobLayout.dialog.close();

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/crawler/jobLayoutJs.jsp

@@ -1,6 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script src="${contextRoot}/develop/lib/plugin/validate/jValidate.js"></script>
<script>
@@ -8,6 +8,8 @@
    var Util = $.Util;
    var schemeVersionList = [];
    var validAdd = null;
    /* *************************** 自定义模块 ***************************** */
    var jobLayout = {
@@ -15,35 +17,44 @@
        grid:null,
        init:function(){
            var me = this;
            $('.m-retrieve-area').show();
            <%--$.ajax({--%>
                <%--url: '${contextRoot}/crawler/getLayout',--%>
                <%--dataType: "json",--%>
                <%--success: function (data) {--%>
                    <%--if(data.successFlg){--%>
                        <%--schemeVersionList = data.detailModelList || [];--%>
                    <%--}else{--%>
                        <%--$.ligerDialog.error(data.message);--%>
                    <%--}--%>
            $.ajax({
                url: '${contextRoot}/crawler/getSchemeList',
                dataType: "json",
                success: function (data) {
                    if(data.successFlg){
                        schemeVersionList = data.detailModelList || [];
                        me.loadGrid();
                    }else{
                        $.ligerDialog.error(data.message);
                    }
                },
                error: function (jqXHR, textStatus, errorThrown) {
                    $.ligerDialog.error("获取适配方案版本列表失败！")
                }
            });
                <%--},--%>
                <%--error: function (jqXHR, textStatus, errorThrown) {--%>
                    <%--$.ligerDialog.error("获取适配方案版本列表失败！")--%>
                <%--}--%>
            <%--});--%>
            me.grid = $("#div_job_grid").ligerGrid({
            me.bindEvents();
        },
        loadGrid:function(){
            var me= this;
            this.grid = $("#div_job_grid").ligerGrid({
                url: '${contextRoot}/crawler/list',
                method: 'post',
                usePager: true,
                selectRowButtonOnly: true,
                allowHideColumn:false,
                validate : true,
                unSetValidateAttr:false,
                columns: [
                    { display: 'scheme_id', name: 'scheme_id', hide:true },
                    { display: 'datasetId', name: 'datasetId', hide:true },
                    {display:'适配方案',name:'', width: '20%',render: function (row, rowindex, value, column) {
                        var select= '<select class="sel-scheme-name form-control"  id="schemeNm'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                        var select= '<select class="sel-scheme-name form-control required"  id="schemeNm'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                        for(var i=0;i<schemeVersionList.length;i++){
                            select+='<option value="'+schemeVersionList[i].schemeId+'">'+schemeVersionList[i].name+'</option>';
                        }
@@ -53,7 +64,7 @@
                        return  select.prop("outerHTML");
                    }},
                    {display:'版本',name:'',width: '20%',render: function (row, rowindex, value, column) {
                        var select= '<select class="sel-version-name form-control"  id="versionNm'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                        var select= '<select class="sel-version-name form-control required"  id="versionNm'+rowindex+'" style="margin-top:3px;font-size:12px;">';
                        var versionList = [];
                        for(var i=0;i<schemeVersionList.length;i++){
                            if(schemeVersionList[i].schemeId == row.scheme_id){
@@ -69,20 +80,28 @@
                        return  select.prop("outerHTML");
                    }},
                    {display:'数据集名称',name:'datasetName', width: '40%',render: function (row, rowindex, value, column) {
                        var dataSets = value.toString().substring(0,value.length-1);
                        var html = '<input style="margin-top:3px;font-size:12px;" data-rowindex="'+rowindex+'" id="dataSets'+rowindex+'" class="sel-dataset-name form-control" value="'+(dataSets || "")+'" >' ;
                        var dataSets = value;
                        if(value==undefined){
                            dataSets="";
                        }else if(value.toString().substring(value.length-1,value.length)==","){
                            dataSets=value.toString().substring(0,value.length-1);
                        }
                        var html = '<input style="margin-top:3px;font-size:12px;" data-rowindex="'+rowindex+'" id="dataSets'+rowindex+'" class="required sel-dataset-name form-control" value="'+(dataSets || "")+'" >' ;
                        return html;
                    }},
                    {display:'操作', name: 'operator', width: '20%', render: function (row) {
                    {display:'操作', name: 'operator', width: '20%', render: function (row, rowindex, value, column) {
                        var html = '<div class="m-inline-buttons" style="width:120px;">';
                        html += '<a href="javascript:void(0)" style="width: 80px;" onclick="javascript:jobLayout.mapping(\''+row.id+'\')">数据映射</a>';
                        html += '<a class="m-btn-delete" onclick="javascript:jobLayout.delete(\''+row.id+'\')"></a>';
                        html += '<a href="javascript:void(0)" style="width: 80px;" class="mapping"  data-rowindex="'+rowindex+'" data-datasetid="'+row.datasetId+'" onclick="javascript:jobLayout.mapping(\''+rowindex+'\')">数据映射</a>';
                        html += '<a class="m-btn-delete" onclick="javascript:jobLayout.delete(\''+rowindex+'\')"></a>';
                        return html;
                    }}
                ],
                onAfterShowData: function (gridData) {//显示完数据事件
                    validAdd = new jQuery.jValidation.Validation($("#div_job_grid"),{immediate:true,onSubmit:false});
//                    $('#div_job_grid').on('blur','.required',function() {
//                        jQuery.jValidation.Validation.validateElement(this);
//                    });
                    //【适配方案】change事件
                    $(".sel-scheme-name").on("change", function() {
                        var rowIndex = $(this).attr("id").replace("schemeNm","");
@@ -98,16 +117,30 @@
                        }
                        $("#versionNm"+rowIndex).html("");
                        $("#versionNm"+rowIndex).append(option);
                        //改变
                        jQuery.data($("#dataSets"+rowIndex)[0], "checkedRowsIndex", []);
                        jQuery.data($(".mapping").eq(rowIndex)[0], "mappingData","");
                        $("#dataSets"+rowIndex).val("");
                    });
                    //【数据集名称】focus事件
                    $(".sel-dataset-name").on("focus", function() {
                        var rowindex = $(this).attr("data-rowindex");
                        jobLayout.grid.select(rowindex);//选中行
                        var selectedVersionId = $("#versionNm"+rowindex).val();
                        if(selectedVersionId==null){
                            $.ligerDialog.error("当前版本为空，不能选择数据集！");
                            return false;
                        }
                        var row = jobLayout.grid.getSelectedRow();
                        var checkedRowsIndex =JSON.stringify(jQuery.data($("#dataSets"+rowindex)[0], "checkedRowsIndex"))  || "";//获取缓存勾选的数据集
                        var  params = {schemeId:row.scheme_id,version:row.scheme_version_id,schemeNm:$("#schemeNm"+rowindex).find("option:selected").text(),checkedRowsIndex:checkedRowsIndex};
                        debugger
                        var  params = {
                            schemeId:$("#schemeNm"+rowindex).val(),
                            versionId: $("#versionNm"+rowindex).val(),
                            schemeNm:$("#schemeNm"+rowindex).find("option:selected").text(),
                            checkedRowsIndex:checkedRowsIndex};
                        me.dialog = $.ligerDialog.open({
                            height: 600,
                            width: 600,
@@ -121,36 +154,87 @@
                }
            });
            me.bindEvents();
        },
        //绑定按钮事件
        bindEvents: function () {
            var me = this;
            $('#btnAdd').click(function () {
                debugger
                me.gridScrollTop();//1、将滚动条滚动到底部
                var dataRow = {
                    schemeId:'',
                    id:'',
                    dataSets:''
                    scheme_id:'',
                    scheme_version_id:'',
                    datasetName:'',
                    datasetId:''
                };
                var rowData = me.grid.getData();
                for (var i = 0; i < rowData.length; i++) {
                    me.grid.rows[i].schemeId = $("#schemeNm"+i).val();
                    me.grid.rows[i].id= $("#versionNm"+i).val();
                    me.grid.rows[i].dataSets= $("#dataSets"+i).val();
                    me.grid.rows[i].scheme_id = $("#schemeNm"+i).val();
                    me.grid.rows[i].scheme_version_id= $("#versionNm"+i).val();
                    me.grid.rows[i].datasetName= $("#dataSets"+i).val();
                }
                //将新添加的行插入到最后一列
                me.grid.addRow(dataRow);
                $(".sel-scheme-name#schemeNm"+rowData.length).trigger("change");
                
                $(".m-btn-delete").eq(rowData.length).data("flag","add");
            });
            $('#btnSave').click(function(){
                //jQuery.data($("#dataSets0")[0], "checkedRowsIndex")
               // jQuery.data($("#dataSets0")[0], "dataSets")
                
                if(!validAdd.validate()){
                    return false;
                }
                var rowData = me.grid.getData();
                var resultArr = [];
                for (var i = 0; i < rowData.length; i++) {
                    var row = {     schemeId:$("#schemeNm"+i).val(),
                                    versionId: $("#versionNm"+i).val(),
                                    dataSets:jQuery.data($("#dataSets"+i)[0], "dataSets")==undefined?rowData[i].datasetId:jQuery.data($("#dataSets"+i)[0], "dataSets"),
                                     relation:jQuery.data( $(".mapping").eq(i)[0], "mappingData")==undefined || ""?"":jQuery.data( $(".mapping").eq(i)[0], "mappingData")}
                    resultArr.push(row);
                }
                /* 判断适配方案与版本是否重复*/
                var uniqueArr = me.uniqueArray(resultArr);
                if(resultArr.length!==uniqueArr.length){
                    $.ligerDialog.error("相同适配方案下，不能有相同的版本!");
                    return false;
                }
                $.ajax({
                    url: "${contextRoot}/crawler/saveDateSet",
                    type: "post",
                    dataType: "json",
                    data:{job: JSON.stringify(resultArr)},
                    success: function (data) {
                        
                        if(data.successFlg){
                            $.ligerDialog.success(data.message);
                            jobLayout.grid.loadData(true);
                        }else{
                            $.ligerDialog.error(data.message);
                        }
                    },error:function(){
                    }
                });
            });
        },
        contains:function(a, e){
            for(j=0;j<a.length;j++)if(a[j]==e)return true;
            return false;
        },
        uniqueArray:function(a){ /* 判断适配方案与版本是否重复*/
            var temp = new Array();
            for(var i = 0; i < a.length; i ++){
                if(!this.contains(temp, a[i].schemeId + a[i].versionId)){
                    temp.length+=1;
                    temp[temp.length-1] = a[i].schemeId + a[i].versionId;
                }
            }
            return temp;
        },
        gridScrollTop:function(){
            var div = $('#div_job_grid')[0],
                    scrollHeight = div.scrollHeight;
@@ -165,12 +249,23 @@
                if (scrollTop >= scrollHeight) clearInterval(timer);}, 100);//滚动到底部，释放计时器
        },
        //数据映射
        mapping:function(id){
        mapping:function(rowindex){
            
            var versionId = $("#versionNm"+rowindex).val();
            var datasetIdStr =  jQuery.data($("#dataSets"+rowindex)[0], "dataSets")==undefined?$(".mapping").eq(rowindex).data("datasetid"):jQuery.data($("#dataSets"+rowindex)[0], "dataSets");
            if(versionId==null){
                $.ligerDialog.error("当前版本为空，不能进行数据映射！");
                return false;
            }
            if( $("#dataSets"+rowindex).val()==""){
                $.ligerDialog.error("当前勾选的数据集数据为空，不能进行数据映射！");
                return false;
            }
            var me = this;
            var  params = {jobId:id};
            var  params = {versionId:versionId,datasetIdStr:datasetIdStr};
            me.dialog = $.ligerDialog.open({
                height: 600,
                width: 800,
                height: 800,
                width: 1200,
                title: "数据映射",
                url: '${contextRoot}/crawler/jobDataMapping',
                //load: true,
@@ -178,33 +273,49 @@
            });
        },
        //删除数据映射
        delete:function(id)
        delete:function(rowindex)
        {
            $.ligerDialog.confirm("确定要删除该适配方案数据映射吗？", function (confirm) {
                if (confirm)
                {
                    $.ajax({ //ajax处理
                        type: "POST",
                        url : "${contextRoot}/datacollect/deleteJob",
                        dataType : "json",
                        data:{jobId:id},
                        cache:false,
                        success :function(data){
                            if(data.successFlg) {
                                $.ligerDialog.success(data.message);
                                jobLayout.grid.reload();
                            }
                            else{
                                $.ligerDialog.error(data.message);
                            }
                        },
                        error :function(data){
                            $.ligerDialog.error("Status:"+data.status +"(" +data.statusText+")");
                        }
                    });
            
            var me = this;
           var addFlag =  $(".m-btn-delete").eq(rowindex).data("flag");//判断是否是新增的数据。若是新增的数据，则直接删除数据，不发送后台请求
            if(addFlag=="add"){
                $.ligerDialog.confirm("确定要删除该适配方案数据映射吗？", function (confirm) {
                    if (confirm)
                    {
                        me.grid.deleteRow(rowindex);
                    }
                });
            }else{
                var delVersionId = $("#versionNm"+rowindex).val();
                if(delVersionId==null){
                    $.ligerDialog.error("当前没有选择适配版本，不能删除！");
                    return false;
                }
            });
                $.ligerDialog.confirm("确定要删除该适配方案数据映射吗？", function (confirm) {
                    if (confirm)
                    {
                        $.ajax({ //ajax处理
                            type: "POST",
                            url : "${contextRoot}/crawler/deleteDateSet",
                            dataType : "json",
                            data:{version:delVersionId},
                            cache:false,
                            success :function(data){
                                if(data.successFlg) {
                                    $.ligerDialog.success(data.message);
                                    jobLayout.grid.loadData(true);
                                }
                                else{
                                    $.ligerDialog.error(data.message);
                                }
                            },
                            error :function(data){
                                $.ligerDialog.error("删除失败！");
                            }
                        });
                    }
                });
            }
        },
        //弹窗返回消息

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/configurationJs.jsp

@@ -194,7 +194,7 @@
            var url = '${contextRoot}' + cfg[cfgModel].left.search;
            reloadGrid.call(this, url, values, this.getColumn());
          }else{
            this.grid.setOptions({parms: $.extend({},values)});
            this.grid.setOptions({parms: $.extend({},values),newPage: 1});
            //重新查询
            this.grid.loadData(true);
          }
@@ -471,7 +471,7 @@
          if (changeFlag){
            reloadGrid.call(this, '${contextRoot}'+cfg[cfgModel].right.search, values, this.getColumn());
          }else{
            this.grid.setOptions({parms: $.extend({},values)});
            this.grid.setOptions({parms: $.extend({},values),newPage: 1});
            //重新查询
            this.grid.loadData(true);
          }
@@ -620,7 +620,7 @@
              dataType : "json",
              async:false,
              success :function(data){
                debugger
                
                if(data.successFlg){
                  entryMaster.reloadGrid(); //重新查询，返回json记录集
                  $.ligerDialog.success(data.message);
@@ -689,7 +689,7 @@
              dataType : "json",
              async:false,
              success :function(data){
                debugger
                
                if(data.successFlg){
                  entryMaster.reloadGrid(); //重新查询，返回json记录集
                  $.ligerDialog.success(data.message);
@@ -1068,7 +1068,7 @@
              dataType : "json",
              url: url,
              processResults: function (data, page) {
                debugger
                
                if(data.successFlg){
                  if(targer=="adapterDatasetCode" || targer=="adapterMetadataCode"
                          || targer=="adapterDictCode" || targer=="adapterEntryCode" || targer=="stdEntryCode"){//由于机构适配值的数据格式为id：id+“，”+code，text：name，但是机构适配值为id:id+","+name,text:code,所以需要重新组装数据

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/indexJs.jsp

@@ -235,7 +235,7 @@
      var row = adapterplan.list.grid.getParent(adapterplan.list.grid.getSelectedRow());
      var name = "";
      if(row!=null){//是父节点
        name = row.name+"_"+adapterplan.list.grid.getSelectedRow().name;
        name = encodeURIComponent(row.name+"_"+adapterplan.list.grid.getSelectedRow().name);
      }
      indexPage.openChildPage("",'${contextRoot}/adapterPlan/configuration?version='+version+"&status="+status+"&schemeId="+schemeId+"&stdVersion="+stdVersion+"&adapterStdVersion="+adapterStdVersion+"&name="+name);
@@ -292,7 +292,7 @@
            dataType: "json",
            data: {versionId: Number(versionId)},
            success: function (data) {
              debugger
              
              if(data.successFlg){
                $.ligerDialog.success(data.message);
                adapterplan.list.getTypeList();

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/appIndexJs.jsp

@@ -226,7 +226,7 @@
      var rootRow =  standard.list.grid.getParent(standard.list.grid.getParent(standard.list.grid.getSelectedRow()));
      var name = "";
      if(rootRow!=null && row!=null){//是父节点
        name =  rootRow.name+"_"+row.name+"_"+standard.list.grid.getSelectedRow().name;
        name =  encodeURIComponent(rootRow.name+"_"+row.name+"_"+standard.list.grid.getSelectedRow().name);
      }
      indexPage.openChildPage("",'${contextRoot}/integration/configuration?version='+code+"&stdId="+pid+"&type="+$("#type").val()+"&status="+status+"&name="+name);
@@ -271,7 +271,7 @@
                }
              },
            error: function (jqXHR, textStatus, errorThrown) {
              debugger
              
                $.ligerDialog.error("删除失败！");
            }
          })

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/configurationJs.jsp

@@ -3,7 +3,7 @@
<link href="${contextRoot}/develop/lib/select2/select2.min.css" rel="stylesheet">
<script src="${contextRoot}/develop/lib/select2/select2.js"></script>
<script >
  (function ($, win) {
      /* ************************** 全局变量定义 **************************** */
      var status = $("#publish_status").val();
      var Util = $.Util;
@@ -233,7 +233,7 @@
            var url = '${contextRoot}' + cfg[cfgModel].left.search;
            reloadGrid.call(this, url, values, this.getColumn());
          }else{
            this.grid.setOptions({parms: $.extend({},values)});
            this.grid.setOptions({parms: $.extend({},values),newPage: 1});
            //重新查询
            this.grid.loadData(true);
          }
@@ -385,7 +385,7 @@
          if (changeFlag){
            reloadGrid.call(this, '${contextRoot}'+cfg[cfgModel].right.search, values, this.getColumn());
          }else{
            this.grid.setOptions({parms: $.extend({},values)});
            this.grid.setOptions({parms: $.extend({},values),newPage: 1});
            //重新查询
            this.grid.loadData(true);
          }
@@ -555,7 +555,7 @@
            dataType: "json",
            data:{activityFlag:'1'},
            success: function (data) {
              debugger
              
              if(data.successFlg && !Util.isStrEmpty(data.detailModelList)){
                orgList = data.detailModelList;
              }else{
@@ -660,7 +660,7 @@
          if (changeFlag){
            reloadGrid.call(this, '${contextRoot}/datacollect/getDatasetSource', values, this.getColumn());
          }else{
            this.grid.setOptions({parms: $.extend({},values)});
            this.grid.setOptions({parms: $.extend({},values),newPage: 1});
            //重新查询
            this.grid.loadData(true);
          }
@@ -730,4 +730,5 @@
        $(function () {
          pageInit();
        });
  })(jQuery, window);
</script>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/indexJs.jsp

@@ -154,7 +154,8 @@
      });
    },
    add: function (id,name,description, type) {
        if($("#div_cda_type_gridgrid").find(".l-grid-body-table tr").eq(1).length>0){//机构下已有标准数据，则”新增标准“按钮隐藏
      
        if($("#div_cda_type_gridgrid").find(".l-grid-body-table tr").eq(1).length>0 && type==""){//机构下已有标准数据，则”新增标准“按钮隐藏
          $.ligerDialog.error("当前已有集成标准，无法新增！");
          return false;
       }
@@ -224,14 +225,15 @@
      standard.list.showDialog(_tital, _url, 300, 400, callback);
    },
    config: function (code,pid,status,rowindex) {
      
      standard.list.grid.select(rowindex);//选中行
      var row = standard.list.grid.getParent(standard.list.grid.getSelectedRow());
      var name = "";
      if(row!=null){//是父节点
        name = row.name+"_"+standard.list.grid.getSelectedRow().name;
        name = encodeURIComponent( row.name+"_"+standard.list.grid.getSelectedRow().name);
      }
      indexPage.openChildPage("",'${contextRoot}/integration/configuration?version='+code+"&stdId="+pid+"&type="+$("#type").val()+"&status="+status+"&name="+name);
      indexPage.openChildPage("",'${contextRoot}/integration/configuration?version='+code+"&stdId="+pid+"&name="+name+"&type="+$("#type").val()+"&status="+status);
    },
    deleted: function (id,name,rowindex) {
      standard.list.grid.select(rowindex);//选中行

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/standardDetail.jsp

@@ -12,7 +12,7 @@
  <div class="m-form-group">
    <label>发布机构：</label>
    <div class="l-text-wrapper m-form-control">
      <label type="text" class="f-w240" id="lbl_publisher" data-align="left" style="text-align: left"></label>
      <label type="text" class="f-w240" id="lbl_publisher" data-align="left" style="text-align: left;height: 32px;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;"></label>
    </div>
  </div>
  <div class="m-form-group">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/standardDetailJs.jsp

@@ -40,6 +40,7 @@
                  success: function (data) {
                      if(data.successFlg){
                          $("#lbl_publisher").text(data.publisher);
                          $("#lbl_publisher").attr("title",data.publisher);
                          $("#lbl_publisherOrgCode").text(data.publisherOrgCode);
                          u.$form.attrScan();
                          u.$form.Fields.fillValues({
@@ -79,6 +80,7 @@
                  success: function (data) {
                      if(data.successFlg){
                          $("#lbl_publisher").text(data.name);
                          $("#lbl_publisher").attr("title",data.name);
                          $("#lbl_publisherOrgCode").text(data.code);
                      }else{
                          $.ligerDialog.error(data.message);

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/standard/integration/versionDetailJs.jsp

@@ -127,6 +127,7 @@
            $("#btn_save").html("确认中...").css("pointer-events","none");
            var _url = "";
            var resultData;
            
            standard.version.$addform.attrScan();
            var jsonString = $.parseJSON(standard.version.$addform.Fields.toJsonString());
              if( $("#type").val()=="0"){//新增保存
@@ -147,6 +148,7 @@
                  var data = standard.version._getData;
                  data.name = jsonString.name;
                  resultData = data;
                  resultData.publishTime = new Date(resultData.publishTime);
                  _url = standard.version._url+"/standardCenter/updateVersion";
              }

Hos-resource/src/main/webapp/develop/lib/jobMapping/tableViewer.js

@@ -791,7 +791,7 @@
	})
	// 处理鼠标进入表格覆盖层
	.on('mouseenter','div.j-cover',function() {
			debugger
			
		var code = $(this).attr('code'),
		TV = $.TableView,
		$table = TV.tables[code].$node;
@@ -804,7 +804,7 @@
	})
	// 处理鼠标离开表格覆盖层
	.on('mouseleave','.m-table-viewer',function() {
			debugger
			
		var code = $(this).find('ul').attr('code'),
		TV = $.TableView,
		$table = TV.tables[code].$node;
@@ -816,7 +816,7 @@
	// 绑定窗口大小改变事件
	$(window).on('resize',function() {
		debugger
		
		var TV = $.TableView,
			curTV = TV.curTV;
		curTV.reInit();
@@ -824,7 +824,7 @@
	})
	// 监听窗口滚动
	.on('scroll',function() {
			debugger
			
		$.TableView.resizeCanvas();
	});
})(window, jQuery);

Hos-resource/src/main/webapp/develop/lib/ligerui/ligerui.all.js

@@ -12752,7 +12752,7 @@
            stat = stat.replace(/{to}/, r2);
            stat = stat.replace(/{total}/, p.total);
            stat = stat.replace(/{pagesize}/, p.pageSize);
            $('.l-bar-text', g.toolbar).html(stat);
            $('.l-bar-text', g.toolbar).html(stat).attr("title",stat);
            if (!p.total)
            {
                $(".l-bar-btnfirst span,.l-bar-btnprev span,.l-bar-btnnext span,.l-bar-btnlast span", g.toolbar)

Hos-resource/src/main/webapp/develop/lib/ligerui/skins/custom/css/all.css

@@ -199,4 +199,6 @@ td.l-filter-rowlastcell{vertical-align:top;line-height:27px;}
.l-verify-tip-corner{top:12px;}
.l-verify-tip-content{line-height:30px;padding-top:0px;padding-bottom:0px;}
.f-pl5{padding-left: 5px;}
.f-pl5{padding-left: 5px;}
#div_left_grid .l-bar-group.l-bar-message{    overflow: hidden;  text-overflow: ellipsis;  white-space: nowrap;  width: 80px;  left: 305px;  height: 30px;}
#div_relation_grid .l-bar-group.l-bar-message{    overflow: hidden;  text-overflow: ellipsis;  white-space: nowrap;  width: 216px;  height: 30px;}