#规则完善

LSH

2023-08-22 247287298f3b6b45501f0d6819cca70b2c8077b8

#规则完善

 src/main/java/com/zy/crm/manager/entity/Rule.java

@@ -103,6 +103,20 @@
        this.ruleStandby2 = ruleStandby2;
    }

    public String getRuleType$(){
        if (null == this.ruleType){ return null; }
        switch (this.ruleType){
            case 1:
                return "生成当前日期时间戳";
            case 2:
                return "生成长度为10的随机字符串";
            case 3:
                return "生成日期时间字符串";
            default:
                return String.valueOf(this.ruleType);
        }
    }

    public String getRuleConnectorType$(){
        if (null == this.ruleConnectorType){ return null; }
        switch (this.ruleConnectorType){
@@ -116,12 +130,12 @@
    }

    public String getRuleConnector$(){
        if (null == this.ruleConnectorType){ return null; }
        if (null == this.ruleConnector){ return null; }
        switch (this.ruleConnector){
            case "-":
                return "默认'-'";
                return "默认:-";
            default:
                return String.valueOf(this.ruleConnectorType);
                return String.valueOf(this.ruleConnector);
        }
    }


 src/main/webapp/static/js/rule/rule.js

@@ -23,10 +23,10 @@
        cols: [[
            // {type: 'checkbox'},
            {field: 'id', align: 'center',title: 'ID',width: 80, hide:true}
            ,{field: 'ruleType', align: 'center',title: '规则方式', hide:false}
            ,{field: 'ruleType$', align: 'center',title: '规则方式', hide:false}
            ,{field: 'ruleHeader', align: 'center',title: '规则头', hide:false}
            ,{field: 'ruleBody', align: 'center',title: '规则体', hide:false}
            ,{field: 'ruleConnector', align: 'center',title: '连接符', hide:false}
            ,{field: 'ruleConnector$', align: 'center',title: '连接符', hide:false}
            ,{field: 'ruleConnectorType$', align: 'center',title: '连接符是否启用', hide:false}
            ,{field: 'ruleMemo', align: 'center',title: '备注', hide:false}
            ,{field: 'rulePreview', align: 'center',title: '预览',width: 350, hide:false}

 src/main/webapp/views/rule/rule.html

@@ -65,8 +65,13 @@
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">规则方式: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="ruleType" placeholder="请输入规则方式（默认1：当前日期时间戳）" lay-vertype="tips" lay-verify="required">
                    <div class="layui-input-inline">
                        <select class="layui-input" name="ruleType" lay-vertype="tips" lay-verify="required">
                            <option style="display: none"></option>
                            <option value="1">生成当前日期时间戳</option>
                            <option value="2">生成长度为10的随机字符串</option>
                            <option value="3">生成日期时间字符串</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
@@ -83,14 +88,24 @@
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">连接符(默认"-"): </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="ruleConnector" placeholder="请输入连接符（默认“-”）" lay-vertype="tips">
                    <div class="layui-input-inline">
                        <select class="layui-input" name="ruleConnector" lay-vertype="tips">
                            <option style="display: none"></option>
                            <option value="-">-</option>
                            <option value="--">--</option>
                            <option value="---">---</option>
                            <option value="-.-">-.-</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">连接符是否启用: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="ruleConnectorType" placeholder="请输入连接符是否启用（0：启用；1：不启用。默认不启用）" lay-vertype="tips">
                    <div class="layui-input-inline">
                        <select class="layui-input" name="ruleConnectorType" lay-vertype="tips">
                            <option style="display: none"></option>
                            <option value="1">不启用</option>
                            <option value="0">启用</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">