Merge branch 'master' of chenweida/esb into master

Hos-resource/src/main/resources/resource.properties

@@ -1,13 +1,13 @@
hopurl=http://172.19.103.55:8080/WSGW/services/ServiceGateWay
hopurl=http://172.19.103.56:8080/WSGW/services/ServiceGateWay
org_code=41872607-9
username=user
password=standard
serverip=192.168.131.17
serverip=172.19.103.56
port=6020
####################http\u914D\u7F6E\u4FE1\u606F####################
#http.url=http://192.168.131.103:6020/api/v1.0/
#http.url=http://172.19.103.56:6020/api/v1.0/
#http.username=user
#http.password=standard
http.url=http://172.19.103.56:6020/api/v1.0/
http.username=user
http.password=standard
http.gateway=http://172.19.103.57:8890/gateway/transfer
http.gateway=http://172.19.103.56:8890/gateway/transfer

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcebrowse/resourceJs.jsp

@@ -153,7 +153,7 @@
                headerRowHeight: 40,
                // 行的高度
                rowHeight: 40,
                height: "100%",
                height: "96%",
                //  isScroll:true,//是否滚动
                checkbox: true,//选择框
                // 编辑器位置误差调整

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/resourceBrowseJs.jsp

@@ -22,7 +22,7 @@
            this.$title.css("margin-right", document.body.scrollWidth / 2 - 200);
            //初始化layout
            this.$layoutDivWrapper.ligerLayout({
                height: "99%",
                height: "98%",
                leftWidth: 200,
                isLeftCollapse: false,//左边区域初始化不可以隐藏
                allowLeftCollapse: false//左边区域不可以隐藏
@@ -157,7 +157,7 @@
                        headerRowHeight: 40,
                        // 行的高度
                        rowHeight: 40,
                        height: "100%",
                        height: "96%",
                        //  isScroll:true,//是否滚动
                        checkbox: true,//选择框
                        // 编辑器位置误差调整

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceAuthorize.jsp

@@ -18,7 +18,7 @@
            <div id="btn_authorize_app" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam" >
                <span>应用授权</span>
            </div>
            <div class="l-text-wrapper m-form-control" style="margin-bottom: 5px;margin-top: 32px">
            <div class="l-text-wrapper m-form-control" style="margin-bottom: 5px;margin-top: 5px">
                <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入应用名称"/>
            </div>
            <div id="left_grid"></div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceAuthorizeDialogJs.jsp

@@ -115,7 +115,7 @@
                 allowAdjustColWidth: false,//不可以调整列宽
                 validate: true,
                 width: 200,
                 height: 370,
                 height: 360,
                 fitColumn: false,
                 data: {detailModelList: data.select},
                 usePager: false,//不显示分页
@@ -135,7 +135,7 @@
                 width: 200,
                 data: {detailModelList: data.noSelect},
                 fitColumn: false,
                 height: 370,
                 height: 360,
                 usePager: false,//不显示分页
                 onDblClickRow: function (data, rowid, rowdata) {
                     this$leftDG.ligerGrid("deleteRow", rowdata);

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceAuthorizeJs.jsp

@@ -136,13 +136,14 @@
                width: 190,
                parms: {rows: 10000, resourceId: reResourceAuthorize.resourceId},
                fitColumn: false,
                height: document.body.scrollHeight - 265,
                height: "97%",
                usePager: false,//不显示分页
                onSelectRow: function (rowdata, rowid, rowobj) {
                    reResourceAuthorize.selectAppId = rowdata.id;
                    reResourceAuthorize.$centerDatagrid.loadServerData({resourceId: reResourceAuthorize.resourceId, appId: rowdata.id});
                }
            });
            $("#left_grid").css("margin-top","70px");
        },
        initRight: function () {
            //应用授权
@@ -195,7 +196,7 @@
                width: document.body.scrollWidth - 410,
                fitColumn: false,
                checkbox: true,
                height: document.body.scrollHeight - 265,
                height: "97%",
                usePager: false//不显示分页
            });

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceConfig.jsp

@@ -20,7 +20,7 @@
                <br/>
                <span style="font-size:20px">资源说明：${resourceModel.remark}</span>
            </div>
            <div style="float: right;margin-top: 30px">
            <div style="float: right;margin-top: 20px">
                <div id="btn_import_data" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                    <span>导入数据集</span>
                </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceConfigJs.jsp

@@ -16,7 +16,7 @@
            this.$title.css("margin-right", document.body.scrollWidth / 2 - 200);
            this.$layout.ligerLayout({
                height: "99%",
                bottomHeight: document.body.clientHeight - 255,
                bottomHeight: document.body.clientHeight - 275,
                topHeight: 35,
                allowBottomResize: false,
                allowTopResize: false,
@@ -107,7 +107,7 @@
                    }
                    }
                ],
                height: "100%",
                height: "98%",
                enabledEdit: true,
                validate: true,
                onDblClickRow: function (data, rowid, row) {
@@ -135,7 +135,7 @@
            }
            this.appInfoDialog = $.ligerDialog.open({
                //判断屏幕是大屏还是小屏
                height: document.body.scrollHeight - 20 <= 762 ? document.body.scrollHeight - 20 : 762,
                height: document.body.scrollHeight - 20 <= 765 ? document.body.scrollHeight - 20 : 765,
                width: 600,
                title: title,
                url: '${contextRoot}/resource/resource/rsResourceFieldInfo',

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceFieldInfoDialog.jsp

@@ -86,7 +86,7 @@
                        <label>逻辑数据来源<spring:message code="spe.colon"/></label>
                        <div class="m-form-control">
                        <textarea rows="10" class="l-textarea" style="width:350px;height: 350px"
                        <textarea rows="10" class="l-textarea" style="width:350px;height: 330px"
                                  data-attr-scan="logicDataSource"></textarea>
                        </div>
                    </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceFieldInfoDialogJs.jsp

@@ -51,8 +51,8 @@
        initlayout: function () {
            //初始化layout
            this.$formLayout.ligerLayout({
                height: 700,
                bottomHeight: 30,
                height: 690,
                bottomHeight: 25,
                topHeight: 240,
                isLeftCollapse: false,//左边区域初始化不可以隐藏
                isRightCollapse: false,//左边区域初始化不可以隐藏

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceImportDatasetDialogJs.jsp

@@ -178,7 +178,7 @@
                allowAdjustColWidth: false,
                width: 240,
                fitColumn: false,
                height: 370,
                height: 360,
                usePager: false,//不显示分页
                onSelectRow: function (rowdata, rowid, rowobj) {
                    this$RightDG.ligerGrid("loadServerData", {datasetCode: rowdata.code, datasetId: rsResourceImportDatasetDialog.datasetId});
@@ -211,7 +211,7 @@
                allowAdjustColWidth: false,
                width: 240,
                fitColumn: false,
                height: 370,
                height: 360,
                usePager: false,//不显示分页
                isChecked: function (row) {
                    if (row.checked == "true") {

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceInfoDialog.jsp

@@ -4,7 +4,7 @@
<div id="div_info_form" data-role-form class="m-form-inline f-mt20 " data-role-form>
    <div class="m-form-group">
        <label>名称<spring:message code="spe.colon"/></label>
        <label>资源名称<spring:message code="spe.colon"/></label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="hidden" id="inp_resource_id" data-type="text" class="required" data-attr-scan="id">
@@ -12,7 +12,7 @@
        </div>
    </div>
    <div class="m-form-group">
        <label>数据来源<spring:message code="spe.colon"/></label>
        <label>资源代码<spring:message code="spe.colon"/></label>
        <div class="l-text-wrapper m-form-control essential">
            <input type="text" id="inp_resource_code" data-type="select" class="required" data-attr-scan="code">
        </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManageJs.jsp

@@ -20,7 +20,7 @@
            });
            //初始化layout
            this.$resourcelayout.ligerLayout({
                height: "100%",
                height: "99%",
                leftWidth: 200,
                isLeftCollapse: false,//左边区域初始化不可以隐藏
                allowLeftCollapse: false//左边区域不可以隐藏
@@ -96,9 +96,10 @@
                    catalog: catalog,
                    status: status
                },
                height:"98%",
                columns: [
                    {display: '名称', name: 'name', width: '15%', isAllowHide: false},
                    {display: '数据来源', name: 'code', width: '31.5%',dict:true,dictName: "RESOURCE_CODE"},
                    {display: '资源名称', name: 'name', width: '15%', isAllowHide: false},
                    {display: '资源代码', name: 'code', width: '31.5%',dict:true,dictName: "RESOURCE_CODE"},
                    {
                        display: '资源类型', name: 'type', width: '15%', resizable: true, render: function (row) {
                        if (row.type == "1") {