Merge branch 'master' of http://192.168.1.220:10080/esb/esb

Conflicts:
	Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceFieldInfoDialog.jsp
	Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManage.jsp
	Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceManageJs.jsp
	Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerEx.js

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceServiceImpl.java

@@ -163,8 +163,7 @@ public class RsResourceServiceImpl extends BaseHttpService implements IRsResourc
        DataGridResult re = new DataGridResult();
        if (StringUtils.isEmpty(params.get("datasetId"))) {
            String jsonS=stdService.datasetsAllVersionList().replace(":null", ":\"\"");
            re.setDetailModelList(net.sf.json.JSONArray.fromObject(jsonS));
            re.setDetailModelList(stdService.datasetsAllVersionList());
        } else {
            RsResourceDataset rd = resourceDatasetDao.getEntity(RsResourceDataset.class, (String) params.get("datasetId"));
            List list = new ArrayList();
@@ -197,7 +196,7 @@ public class RsResourceServiceImpl extends BaseHttpService implements IRsResourc
        Map<String, Object> paramsTemp = new HashMap<String, Object>();
        paramsTemp.put("condition", JSONObject.fromObject(params).toString());
        String responseParasm = stdService.metadatasAllVersionList(paramsTemp);
        List responseParasm = stdService.metadatasAllVersionList(paramsTemp);
        JSONArray array = JSONArray.fromObject(responseParasm);
        if (array.size() == 0) {
            throw new Exception("该数据集没有数据元");
@@ -278,10 +277,8 @@ public class RsResourceServiceImpl extends BaseHttpService implements IRsResourc
        Map<String, Object> params = new HashMap<String, Object>();
        params.put("code", code);
        Map<String, Object> paramsTemp = new HashMap<String, Object>();
        paramsTemp.put("condition", JSONObject.fromObject(params).toString());
        //得到所有的数据元
        String responseParasm = stdService.metadatasAllVersionList(paramsTemp);
        List responseParasm = stdService.metadatasAllVersionList(params);
        JSONArray jr = JSONArray.fromObject(responseParasm);
        if (!StringUtils.isEmpty(datasetId)) {
            List<RsResourceMetadata> md = resourceMetadataDao.getMetadataByLocalDatssetId(datasetId);

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

@@ -17,50 +17,49 @@
    }
</style>
<!-- ####### 页面部分 ####### -->
<div class="m-content">
<div id="div_wrapper">
    <div id="overlay" class="zhezhao"></div>
    <div id="div_wrapper">
        <!--左边 区域-->
        <div position="left" title="">
            <div class="l-text-wrapper m-form-control" style="margin-bottom: 15px;margin-top: 10px">
                <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入资源名称"/>
            </div>
            <ul id="ul_tree1" class="m-snav"></ul>
    <!--左边 区域-->
    <div position="left"  style="margin-left:10px;margin-top:10px;">
        <div class="m-form-control">
            <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入资源名称"/>
        </div>
        <!--右边区域-->
        <div position="center" id="div_wrapper_right" title="">
            <!--右边上面区域-->
            <div position="top" id="div_wrapper_right_top" title="查询条件" class="div_wrapper_right_top">
                <div class="m-form-inline">
                    <div class="m-form-group">
                        <label>过滤条件：</label>
        <ul id="ul_tree1" class="m-snav"></ul>
    </div>
    <!--右边区域-->
    <div position="center" id="div_wrapper_right" style="margin-left:10px;margin-top:10px;margin-right:10px;">
        <!--右边上面区域-->
        <div position="top" id="div_wrapper_right_top" title="查询条件" class="div_wrapper_right_top">
            <div class="m-form-inline">
                <div class="m-form-group">
                    <label>过滤条件：</label>
                        <div class="m-form-control">
                            <input type="text" id="resourceCondition"/>
                        </div>
                    <div class="m-form-control">
                        <input type="text" id="resourceCondition"/>
                    </div>
                </div>
            </div>
            <!--右边下面中间区域-->
            <div position="center" title="" class="f-fwb m-snav">
                <div  style="height: 30px;margin-bottom: 2px">
                    <div class="m-form-control f-ml20">
                        <!--按钮:查询 & 新增-->
                        <div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                            <span><spring:message code="btn.search"/></span>
                        </div>
                    </div>
                    <div id="btn_select" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span>导出选中结果</span>
                    </div>
                    <div id="btn_selectALL" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                        <span>导出查询结果</span>
        </div>
        <!--右边下面中间区域-->
        <div position="center" title="" class="f-fwb m-snav">
            <div  style="height: 40px;">
                <div class="m-form-control f-ml20">
                    <!--按钮:查询 & 新增-->
                    <div id="btn_search" class="l-button">
                        <span><spring:message code="btn.search"/></span>
                    </div>
                </div>
                <div id="div_wrapper_right_bottom_datagrid"></div>
                <div id="btn_select" class="l-button">
                    <span>导出选中结果</span>
                </div>
                <div id="btn_selectALL" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                    <span>导出查询结果</span>
                </div>
            </div>
            <div id="div_wrapper_right_bottom_datagrid"></div>
        </div>
    </div>
</div>
<script src="${staticRoot}/lib/jqueryfiledownload/jquery.fileDownload.js"></script>

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

@@ -153,11 +153,8 @@
                headerRowHeight: 40,
                // 行的高度
                rowHeight: 40,
                height: "100%",
                //  isScroll:true,//是否滚动
                checkbox: true,//选择框
                // 编辑器位置误差调整
                editorTopDiff: 41,
                allowAdjustColWidth: true,
                onSuccess: function (msg) {
                    // resource.hideOverlay();

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

@@ -2,7 +2,7 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<div id="div_info_form"  class="m-form-inline f-mt20 ">
<div id="div_info_form"  class="m-form-inline f-mt20 " style="padding-top: 5px">
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>字段名称：</label>
@@ -10,16 +10,14 @@
            <input type="hidden" data-type="text">
            <input type="hidden" data-type="text" name="resourceId">
            <input type="hidden" id="inp_resource_id"  name="id">
            <input type="text" id="inp_field_name" placeholder="请输入字段名称"
                   required-title="该项为必填项！" name="name"/>
            <input type="text" id="inp_field_name" placeholder="请输入字段名称" name="name"/>
        </div>
    </div>
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>字段代码：</label>
        <div class="l-text-wrapper m-form-control ">
            <input type="text" id="inp_field_code" data-type="select" class="required"
                   data-attr-scan="columnCode" name="columnCode">
            <input type="text" id="inp_field_code" name="columnCode">
        </div>
    </div>
    <div class="m-form-group">
@@ -77,18 +75,19 @@
    <div id="centerTab2">
        <div class="m-form-group">
            <label>逻辑数据来源</label>
            <div class="m-form-control">
            <textarea rows="10" class="l-textarea" style="width:350px;height: 350px" name="logicDataSource"></textarea>
                <textarea rows="10" class="l-textarea" style="width:350px;height: 200px" name="logicDataSource"></textarea>
            </div>
        </div>
    </div>
    <div class="m-form-bottom">
        <div id="btn_cancel" class="l-button l-button-no">
            <span>关闭</span>
        </div>
        <div id="btn_save" class="l-button">
            <span>保存</span>
    <div position="bottom" title="">
        <div class="m-form-bottom">
            <div id="btn_cancel" class="l-button l-button-no">
                <span>关闭</span>
            </div>
            <div id="btn_save" class="l-button">
                <span>保存</span>
            </div>
        </div>
    </div>
</div>

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

@@ -45,8 +45,8 @@
        initlayout: function () {
            //初始化layout
            this.$formLayout.ligerLayout({
                height: 700,
                bottomHeight: 30,
                height: 690,
                bottomHeight: 25,
                topHeight: 240,
                isLeftCollapse: false,//左边区域初始化不可以隐藏
                isRightCollapse: false,//左边区域初始化不可以隐藏
@@ -146,7 +146,6 @@
        },
        bindEvents: function () {
            this.$btnSave.click(function () {
                debugger
                if(!$("#div_info_form").ligerAutoForm("validate")){
                    return;
                }

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

@@ -184,7 +184,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});
@@ -217,7 +217,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/rsResourceManage.jsp

@@ -3,36 +3,36 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<!-- ####### 页面部分 ####### -->
<div class="m-content">
    <div id="div_wrapper">
        <!--左边 区域-->
        <div position="left" title="">
            <div class="l-text-wrapper m-form-control" style="margin-bottom: 15px">
                <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入分类名称"/>
            </div>
            <ul id="div_wrapper_left_ul_resourcetree" class="m-snav"></ul>
<div id="div_wrapper">
    <!--左边 区域-->
    <div position="left"  style="margin-left:10px;margin-top:10px;">
        <div class="m-form-control" style="margin-bottom: 15px">
            <input type="text" id="div_wrapper_left_inp_search" placeholder="请输入分类名称"/>
        </div>
        <div id="div_wrapper_right" position="center" title="">
            <!-- ####### 查询条件部分 ####### -->
            <div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline" data-role-form>
                <div class="m-form-group f-mt10">
                    <div class="m-form-control">
                        <!--输入框-->
                        <input type="text" id="inp_search" placeholder="请输入资源名称" class="f-ml10"
                               data-attr-scan="searchNm"/>
                    </div>
                    <div class="m-form-control m-form-control-fr" style="float: right">
                        <div id="btn_add" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam">
                            <span>新增</span>
                        </div>
        <ul id="div_wrapper_left_ul_resourcetree" class="m-snav"></ul>
    </div>
    <div position="center" style="margin-left:10px;margin-top:10px;margin-right:10px;">
        <!-- ####### 查询条件部分 ####### -->
        <div class="m-form-inline" data-role-form>
            <div class="m-form-group">
                <div class="m-form-control">
                    <!--输入框-->
                    <input type="text" id="inp_search" placeholder="请输入资源名称" data-attr-scan="searchNm"/>
                </div>
                <div class="m-form-control">
                    <!--按钮:查询 & 新增-->
                </div>
                <div class="m-form-control right" >
                    <div id="btn_add" class="l-button">
                        <span>新增</span>
                    </div>
                </div>
            </div>
        </div>
            <!--###### 查询明细列表 ######-->
            <div id="div_app_info_grid">
        <!--###### 查询明细列表 ######-->
        <div id="div_app_info_grid">
            </div>
        </div>
    </div>
</div>

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

@@ -2,7 +2,6 @@
<%@include file="/WEB-INF/ehr/commons/jsp/commonInclude.jsp" %>
<script>
    var rsResoureManege = {
        $element: $('.m-retrieve-area'),
        $searchresourceName: $('#inp_search'),//资源名称文本匡对象
        $catalogDDL: $('#ipt_catalog'),
        $statusDDL: $('#ipt_status'),
@@ -20,7 +19,7 @@
            });
            //初始化layout
            this.$resourcelayout.ligerLayout({
                height: "100%",
                height: "99%",
                leftWidth: 200,
                isLeftCollapse: false,//左边区域初始化不可以隐藏
                allowLeftCollapse: false//左边区域不可以隐藏
@@ -59,19 +58,22 @@
            //初始化树上面的搜索框
            this.$searchTreeBox.ligerSearch({
                width: 200,onClick: function (value) {
                width: 180,onClick: function (value) {
                    if (value != "" && value != null && value != undefined && value.length > 0)
                        $.ligerui.get('div_wrapper_left_ul_resourcetree').queryByText(value);
                }
            });
            //初始化sousuokuang
            this.$searchresourceName.ligerSearch({onClick:function(value){
                rsResoureManege.reloadGridSearch();
            }});
            this.$element.show();
            //初始化搜索按钮
            var this$searchresourceName = this.$searchresourceName;
            this.$searchBtn.click(function () {
                var searchNm = this$searchresourceName.val();
                var selectData = resourceTree.getSelected();
                rsResoureManege.reloadGrid(selectData ? selectData.data.id : "", searchNm);
            })
            this.$element.attrScan();
            window.form = this.$element;
            this.initGrid();
        },
@@ -87,14 +89,13 @@
            this.grid = $("#div_app_info_grid").ligerGrid({
                url: '${contextRoot}/resource/resource/searchRsResource',
                cache:false,
                parms: {
                    catalog: catalog,
                    status: status
                },
                columns: [
                    {display: '名称',id:'name', 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") {
@@ -147,8 +148,7 @@
                    rsResoureManege.editor(data.id, "modify");
                }
            });
            // 自适应宽度
            // this.grid.adjustToWidth();
        },
        reloadGridTree: function (categoryId, resourcename) {
            this.grid.loadServerData({
@@ -200,7 +200,7 @@
                        url: "${contextRoot}/resource/resource/deleteResource",
                        data: {"id": id},
                        success: function (msg) {
                            rsResoureManege.reloadGridSearch();
                            rsResoureManege.reloadGrid();
                        }
                    });
                }
@@ -220,9 +220,6 @@
        },
        dialogCallBack: function (message) {
            $.ligerDialog.success(message);
            rsResoureManege.grid.set({
                parms: {categoryId:rsResoureManege.$resourceTreeId}
            });
            rsResoureManege.grid.reload();
            rsResoureManege.appInfoDialog.close();
        }

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

@@ -825,13 +825,35 @@
        message:null //校验提示
    };
    $.ligerMethos.AutoForm = {};
    $.ligerMethos.AutoForm = {
        showError:function(control,error){
            var dom = $(control).closest(".m-form-control");
            if(dom.hasClass('m-from-error'))
            {
                dom.removeClass('m-from-error').find('.m-from-error-msg').remove();
            }
            var el = $('<div class="m-from-error-msg"></div>');
            dom.addClass('m-from-error').append(el);
            el.hover(function ()
            {
                $(this).ligerTip({content:error});
            },function (){
                $(this).ligerHideTip();
            });
        }
    };
    $.ligerui.controls.AutoForm = function (element, options)
    {
        $.ligerui.controls.AutoForm.base.constructor.call(this, element, options);
    };
    $.ligerui.controls.AutoForm.ligerExtend($.ligerui.core.UIComponent, {
        controls:[], //表单控件
        defaultMessage:{
@@ -880,7 +902,6 @@
                catch(e){
                    return;
                }
            });
            $("input", jform).each(function ()
            {
@@ -1033,7 +1054,7 @@
                    }
                }
                else if(rule== "equalTo")
                {debugger
                {
                    if(ruleValue=="") {
                        return "密码未输入";
                    }
@@ -1050,7 +1071,6 @@
                        {
                            case "email":
                            {
                                var re =new RegExp("^([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+\\.[a-zA-Z]{2,3}$");
                                if(!re.test(value))
                                {
@@ -1060,8 +1080,6 @@
                            }
                            case "ip":
                            {
                                 var re =new RegExp("^(2[5][0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})\\.(25[0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})\\.(25[0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})\\.(25[0-5]|2[0-4]\\d|1\\d{2}|\\d{1,2})$");
                                debugger
                                if(!re.test(value))
@@ -1225,39 +1243,45 @@
                        }
                        //是否报错
                    if (error.length > 0) {
                            if (typeof(message) == "string")
                                error = message;//用户自定义消息覆盖默认消息
                            else {
                                for (var m in message) {
                                    var value = message[m];
                                    if (m == "required" && me.flag == 1) {
                                        error = value;
                                    }
                                    else if (m == "minlength" && me.flag == 2) {
                        if (error.length > 0) {
                            if(message!=undefined&&message!=null)
                            {
                                if (typeof(message) == "string")
                                {
                                    error = message;//用户自定义消息覆盖默认消息
                                }
                                else {
                                    for (var m in message) {
                                        var value = message[m];
                                        if (m == "required" && me.flag == 1) {
                                            error = value;
                                        }
                                        else if (m == "minlength" && me.flag == 2) {
                                        error = value;
                                    }
                                    else if (m == "maxlength" && me.flag == 3) {
                                        error = value;
                                    }
                                    //判断相等情况，以赋值替代val
                                    else if (m == "equalTo" && me.flag == 4) {
                                        error = value;
                                    }
                                    else if (m == "digits" && me.flag == 5) {
                                        error = value;
                                    }
                                    else if (m == "email" && me.flag == 6) {
                                        error = value;
                                    }
                                    else if (m == "ip" && me.flag == 7) {
                                        error = value;
                                            error = value;
                                        }
                                        else if (m == "maxlength" && me.flag == 3) {
                                            error = value;
                                        }
                                        //判断相等情况，以赋值替代val
                                        else if (m == "equalTo" && me.flag == 4) {
                                            error = value;
                                        }
                                        else if (m == "digits" && me.flag == 5) {
                                            error = value;
                                        }
                                        else if (m == "email" && me.flag == 6) {
                                            error = value;
                                        }
                                        else if (m == "ip" && me.flag == 7) {
                                            error = value;
                                        }
                                    }
                                }
                            }
                            if (me.flag == 1) {
                            me.showError(control, error);
                            /*if (me.flag == 1) {
                                me.showError(control, error);//required优先级高
                            }
                            else if (me.flag == 2) {
@@ -1277,10 +1301,11 @@
                            }
                            else if (me.flag == 7) {
                                me.showError(control, error);//
                            }
                            else  if(error!=null && error.length > 0){
                             me.showError(control,error);
                             }
                            }*/
                            //else  if(message!=null && message.length > 0){
                            // me.showError(control,message);
                            // }
                            suc = false;
                        }
                    else