伊宁项目更改相关 统一app增加登录接口 增加阿里icon库

ruoyi-admin/src/main/resources/templates/system/dangan/add.html

@@ -337,6 +337,14 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">应用菜单名：</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" type="text" name="applyMenuName">
+                        </div>
+                    </div>
+                </div>
             </div>
             <div class="row">
                 <div class="col-sm-6">

ruoyi-admin/src/main/resources/templates/system/dangan/edit.html

@@ -315,6 +315,81 @@
                 </div>
             </div>
             <div class="row">
+                  <span style="padding-left: 30%!important;">
+                      ------------------------------------------------apply模块--------------------------------------------------
+                  </span>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">apply图标：</label>
+                        <div class="col-sm-8">
+                            <input id="iconApp" name="iconApp" class="form-control" th:field="*{iconApp}" type="text" placeholder="选择图标">
+                            <div class="ms-parent" style="width: 100%;">
+                                <div class="icon-drop animated flipInX" style="display: none;max-height:200px;overflow-y:auto">
+                                    <div data-th-include="system/dangan/icon"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">应用菜单名：</label>
+                        <div class="col-sm-8">
+                            <input class="form-control" th:field="*{applyMenuName}" type="text" name="applyMenuName">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">apply类型：</label>
+                        <div class="col-sm-8">
+                            <select name="applyType" id="applyType" th:field="*{applyType}" class="form-control m-b">
+                                <option value="-1" selected="selected">请选择</option>
+                                <option value="0">APP</option>
+                                <option value="1">H5</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" id="appDiv" style="display: none">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">包名：</label>
+                        <div class="col-sm-8">
+                            <input name="packName" th:field="*{packName}" class="form-control">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">模块名：</label>
+                        <div class="col-sm-8">
+                            <input name="modelName" th:field="*{modelName}" class="form-control">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" id="h5Div" style="display: none">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-3 control-label">H5_URL地址：</label>
+                        <div class="col-sm-8">
+                            <input name="hUrl" th:field="*{hUrl}" class="form-control">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                  <span style="padding-left: 30%!important;">
+                      ------------------------------------------------APP模块--------------------------------------------------
+                  </span>
+            </div>
+            <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
                         <label class="col-sm-3 control-label">排序：</label>
@@ -384,6 +459,70 @@
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
+        $(function() {
+            $("input[name='iconApp']").focus(function() {
+                $(".icon-drop").show();
+            });
+            $("#form-dangan-add").click(function(event) {
+                var obj = event.srcElement || event.target;
+                if (!$(obj).is("input[name='iconApp']")) {
+                    $(".icon-drop").hide();
+                }
+            });
+            $(".icon-drop").find(".ico-list i").on("click", function() {
+                let className = $(this).attr('class');
+                $('#iconApp').val((className+"").replace("icon iconfont ",""));
+            });
+            $('input').on('ifChecked', function(event){
+                var menuType = $(event.target).val();
+                if (menuType == "M") {
+                    $("#iconApp").parents(".form-group").show();
+                    $("#target").parents(".form-group").hide();
+                    $("input[name='visible']").parents(".form-group").show();
+                    $(".is-refresh").hide();
+                } else if (menuType == "C") {
+                    $("#iconApp").parents(".form-group").show();
+                    $("#target").parents(".form-group").show();
+                    $("input[name='visible']").parents(".form-group").show();
+                    $(".is-refresh").show();
+                } else if (menuType == "F") {
+                    $("#iconApp").parents(".form-group").hide();
+                    $("#target").parents(".form-group").hide();
+                    $("input[name='visible']").parents(".form-group").hide();
+                    $(".is-refresh").hide();
+                }
+            });
+        });
+
+        $("#applyType").change(function () {
+            let applyTypeValue = $(this).val();
+            if(applyTypeValue===0||applyTypeValue==="0"){
+                $("#appDiv").show();
+                $("#h5Div").hide();
+            }else if(applyTypeValue===1||applyTypeValue==="1"){
+                $("#appDiv").hide();
+                $("#h5Div").show();
+            }else{
+                $("#appDiv").hide();
+                $("#h5Div").hide();
+            }
+        });
+        
+        function loadSelectApplyType() {
+            let applyTypeValue = $("#applyType").val();
+            if(applyTypeValue===0||applyTypeValue==="0"){
+                $("#appDiv").show();
+                $("#h5Div").hide();
+            }else if(applyTypeValue===1||applyTypeValue==="1"){
+                $("#appDiv").hide();
+                $("#h5Div").show();
+            }else{
+                $("#appDiv").hide();
+                $("#h5Div").hide();
+            }
+        }
+        loadSelectApplyType();
+
         var prefix = ctx + "system/dangan";
         var danganFileList = [[${fileList}]];
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/Dangan.java

@@ -174,9 +174,19 @@ public class Dangan extends BaseEntity
 
     private String hUrl;//h5路径 applyType为1时有效
 
+    private String applyMenuName;//应用菜单名
+
     //TODO 查询用组装字段, 数据库结构无关
     private String danganLoginName;
 
+    public String getApplyMenuName() {
+        return applyMenuName;
+    }
+
+    public void setApplyMenuName(String applyMenuName) {
+        this.applyMenuName = applyMenuName;
+    }
+
     public String getDanganLoginName() {
         return danganLoginName;
     }