修复菜单组 标签必填bug

Api/src/main/java/com/java110/api/listener/menuGroup/SaveMenuGroupListener.java

@@ -34,7 +34,6 @@ public class SaveMenuGroupListener extends AbstractServiceApiListener {
 
         Assert.hasKeyAndValue(reqJson, "name", "必填，请填写组名称");
         Assert.hasKeyAndValue(reqJson, "icon", "必填，请填写icon");
-        Assert.hasKeyAndValue(reqJson, "label", "必填，请填写标签");
         Assert.hasKeyAndValue(reqJson, "seq", "必填，请填写序列");
 
     }

Api/src/main/java/com/java110/api/listener/menuGroup/UpdateMenuGroupListener.java

@@ -31,7 +31,6 @@ public class UpdateMenuGroupListener extends AbstractServiceApiListener {
         Assert.hasKeyAndValue(reqJson, "gId", "组Id不能为空");
         Assert.hasKeyAndValue(reqJson, "name", "必填，请填写组名称");
         Assert.hasKeyAndValue(reqJson, "icon", "必填，请填写icon");
-        Assert.hasKeyAndValue(reqJson, "label", "必填，请填写标签");
         Assert.hasKeyAndValue(reqJson, "seq", "必填，请填写序列");
 
     }

WebService/src/main/java/com/java110/web/smo/menuGroup/impl/AddMenuGroupSMOImpl.java

@@ -31,7 +31,6 @@ public class AddMenuGroupSMOImpl extends AbstractComponentSMO implements IAddMen
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyAndValue(paramIn, "name", "必填，请填写组名称");
         Assert.hasKeyAndValue(paramIn, "icon", "必填，请填写icon");
-        Assert.hasKeyAndValue(paramIn, "label", "必填，请填写标签");
         Assert.hasKeyAndValue(paramIn, "seq", "必填，请填写序列");
 
 

WebService/src/main/java/com/java110/web/smo/menuGroup/impl/EditMenuGroupSMOImpl.java

@@ -31,7 +31,6 @@ public class EditMenuGroupSMOImpl extends AbstractComponentSMO implements IEditM
         Assert.hasKeyAndValue(paramIn, "gId", "组Id不能为空");
         Assert.hasKeyAndValue(paramIn, "name", "必填，请填写组名称");
         Assert.hasKeyAndValue(paramIn, "icon", "必填，请填写icon");
-        Assert.hasKeyAndValue(paramIn, "label", "必填，请填写标签");
         Assert.hasKeyAndValue(paramIn, "seq", "必填，请填写序列");
 
 

WebService/src/main/resources/components/menuGroupPackage/add-menuGroup/addMenuGroup.html

@@ -1,4 +1,5 @@
-<div id = "addMenuGroupModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addMenuGroupModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -20,41 +21,50 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">组名称</label>
-         <div class="col-sm-10">
-           <input v-model="addMenuGroupInfo.name"                   type="text" placeholder="必填，请填写组名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">icon</label>
-         <div class="col-sm-10">
-           <input v-model="addMenuGroupInfo.icon"                   type="text" placeholder="必填，请填写icon" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">标签</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addMenuGroupInfo.label">
-         <option selected  disabled value="">必填，请选择标签</option>
-         <option  value="HOT">HOT</option>
-<option  value="TOP">TOP</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">序列</label>
-         <div class="col-sm-10">
-           <input v-model="addMenuGroupInfo.seq"                   type="text" placeholder="必填，请填写序列" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">描述</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写描述" class="form-control" v-model="addMenuGroupInfo.description"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">组名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addMenuGroupInfo.name" type="text" placeholder="必填，请填写组名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">icon</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addMenuGroupInfo.icon" type="text" placeholder="必填，请填写icon"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">标签</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addMenuGroupInfo.label">
+                                        <option selected disabled value="">选填，请选择标签</option>
+                                        <option value="">无</option>
+                                        <option value="HOT">HOT</option>
+                                        <option value="TOP">TOP</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">序列</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addMenuGroupInfo.seq" type="text" placeholder="必填，请填写序列"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">描述</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="选填，请填写描述" class="form-control"
+                                              v-model="addMenuGroupInfo.description"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveMenuGroupInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveMenuGroupInfo()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/menuGroupPackage/add-menuGroup/addMenuGroup.js

@@ -54,14 +54,10 @@
                         errInfo: "icon必须在2至20字符之间"
                     },
                     ],
-                    'addMenuGroupInfo.label': [{
-                        limit: "required",
-                        param: "",
-                        errInfo: "标签不能为空"
-                    },
+                    'addMenuGroupInfo.label': [,
                     {
-                        limit: "maxin",
-                        param: "1,20",
+                        limit: "maxLength",
+                        param: "20",
                         errInfo: "标签错误"
                     },
                     ],

WebService/src/main/resources/components/menuGroupPackage/edit-menuGroup/editMenuGroup.html

@@ -1,4 +1,5 @@
-<div id = "editMenuGroupModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editMenuGroupModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -7,41 +8,50 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">组名称</label>
-         <div class="col-sm-10">
-           <input v-model="editMenuGroupInfo.name"                   type="text" placeholder="必填，请填写组名称" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">icon</label>
-         <div class="col-sm-10">
-           <input v-model="editMenuGroupInfo.icon"                   type="text" placeholder="必填，请填写icon" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">标签</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editMenuGroupInfo.label">
-         <option selected  disabled value="">必填，请选择标签</option>
-         <option  value="HOT">HOT</option>
-<option  value="TOP">TOP</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">序列</label>
-         <div class="col-sm-10">
-           <input v-model="editMenuGroupInfo.seq"                   type="text" placeholder="必填，请填写序列" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">描述</label>
-         <div class="col-sm-10">
-<textarea  placeholder="选填，请填写描述" class="form-control" v-model="editMenuGroupInfo.description"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">组名称</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editMenuGroupInfo.name" type="text" placeholder="必填，请填写组名称"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">icon</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editMenuGroupInfo.icon" type="text" placeholder="必填，请填写icon"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">标签</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editMenuGroupInfo.label">
+                                        <option selected disabled value="">可填，请选择标签</option>
+                                        <option value="">无</option>
+                                        <option value="HOT">HOT</option>
+                                        <option value="TOP">TOP</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">序列</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editMenuGroupInfo.seq" type="text" placeholder="必填，请填写序列"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">描述</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="选填，请填写描述" class="form-control"
+                                              v-model="editMenuGroupInfo.description"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editMenuGroup()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button" v-on:click="editMenuGroup()">
+                                    <i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/menuGroupPackage/edit-menuGroup/editMenuGroup.js

@@ -1,138 +1,126 @@
-(function(vc,vm){
+(function(vc, vm) {
 
     vc.extends({
-        data:{
-            editMenuGroupInfo:{
-                gId:'',
-name:'',
-icon:'',
-label:'',
-seq:'',
-description:'',
+        data: {
+            editMenuGroupInfo: {
+                gId: '',
+                name: '',
+                icon: '',
+                label: '',
+                seq: '',
+                description: '',
 
             }
         },
-         _initMethod:function(){
+        _initMethod: function() {
 
-         },
-         _initEvent:function(){
-             vc.on('editMenuGroup','openEditMenuGroupModal',function(_params){
+},
+        _initEvent: function() {
+            vc.on('editMenuGroup', 'openEditMenuGroupModal',
+            function(_params) {
                 vc.component.refreshEditMenuGroupInfo();
                 $('#editMenuGroupModel').modal('show');
-                vc.copyObject(_params, vc.component.editMenuGroupInfo );
+                vc.copyObject(_params, vc.component.editMenuGroupInfo);
                 //vc.component.editMenuGroupInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
-        methods:{
-            editMenuGroupValidate:function(){
-                        return vc.validate.validate({
-                            editMenuGroupInfo:vc.component.editMenuGroupInfo
-                        },{
-                            'editMenuGroupInfo.name':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"组名称不能为空"
-                        },
- {
-                            limit:"maxin",
-                            param:"2,10",
-                            errInfo:"组名称必须在2至10字符之间"
-                        },
+        methods: {
+            editMenuGroupValidate: function() {
+                return vc.validate.validate({
+                    editMenuGroupInfo: vc.component.editMenuGroupInfo
+                },
+                {
+                    'editMenuGroupInfo.name': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "组名称不能为空"
+                    },
+                    {
+                        limit: "maxin",
+                        param: "2,10",
+                        errInfo: "组名称必须在2至10字符之间"
+                    },
                     ],
-'editMenuGroupInfo.icon':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"icon不能为空"
-                        },
- {
-                            limit:"maxin",
-                            param:"2,20",
-                            errInfo:"icon必须在2至20字符之间"
-                        },
+                    'editMenuGroupInfo.icon': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "icon不能为空"
+                    },
+                    {
+                        limit: "maxin",
+                        param: "2,20",
+                        errInfo: "icon必须在2至20字符之间"
+                    },
                     ],
-'editMenuGroupInfo.label':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"标签不能为空"
-                        },
- {
-                            limit:"maxin",
-                            param:"1,20",
-                            errInfo:"标签错误"
-                        },
+                    'editMenuGroupInfo.label': [
+                    {
+                        limit: "maxLength",
+                        param: "20",
+                        errInfo: "标签错误"
+                    },
                     ],
-'editMenuGroupInfo.seq':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"序列不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"序列必须为整数"
-                        },
+                    'editMenuGroupInfo.seq': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "序列不能为空"
+                    },
+                    {
+                        limit: "num",
+                        param: "",
+                        errInfo: "序列必须为整数"
+                    },
                     ],
-'editMenuGroupInfo.description':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"备注内容不能超过200"
-                        },
+                    'editMenuGroupInfo.description': [{
+                        limit: "maxLength",
+                        param: "200",
+                        errInfo: "备注内容不能超过200"
+                    },
                     ],
-'editMenuGroupInfo.gId':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"组Id不能为空"
-                        }]
+                    'editMenuGroupInfo.gId': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "组Id不能为空"
+                    }]
 
-                        });
-             },
-            editMenuGroup:function(){
-                if(!vc.component.editMenuGroupValidate()){
+                });
+            },
+            editMenuGroup: function() {
+                if (!vc.component.editMenuGroupValidate()) {
                     vc.toast(vc.validate.errInfo);
-                    return ;
+                    return;
                 }
 
-                vc.http.post(
-                    'editMenuGroup',
-                    'update',
-                    JSON.stringify(vc.component.editMenuGroupInfo),
-                    {
-                        emulateJSON:true
-                     },
-                     function(json,res){
-                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
-                            //关闭model
-                            $('#editMenuGroupModel').modal('hide');
-                             vc.emit('menuGroupManage','listMenuGroup',{});
-                            return ;
-                        }
-                        vc.message(json);
-                     },
-                     function(errInfo,error){
-                        console.log('请求失败处理');
+                vc.http.post('editMenuGroup', 'update', JSON.stringify(vc.component.editMenuGroupInfo), {
+                    emulateJSON: true
+                },
+                function(json, res) {
+                    //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                    if (res.status == 200) {
+                        //关闭model
+                        $('#editMenuGroupModel').modal('hide');
+                        vc.emit('menuGroupManage', 'listMenuGroup', {});
+                        return;
+                    }
+                    vc.message(json);
+                },
+                function(errInfo, error) {
+                    console.log('请求失败处理');
 
-                        vc.message(errInfo);
-                     });
+                    vc.message(errInfo);
+                });
             },
-            refreshEditMenuGroupInfo:function(){
-                vc.component.editMenuGroupInfo= {
-                  gId:'',
-name:'',
-icon:'',
-label:'',
-seq:'',
-description:'',
+            refreshEditMenuGroupInfo: function() {
+                vc.component.editMenuGroupInfo = {
+                    gId: '',
+                    name: '',
+                    icon: '',
+                    label: '',
+                    seq: '',
+                    description: '',
 
                 }
             }
         }
     });
 
-})(window.vc,window.vc.component);
+})(window.vc, window.vc.component);

java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml

@@ -60,7 +60,7 @@
             <if test="icon !=null and icon != ''">
                 t.icon= #{icon},
             </if>
-            <if test="label !=null and label != ''">
+            <if test="label !=null ">
                 t.label= #{label},
             </if>
             <if test="seq !=null ">