Authored by 王涛

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

新增用户时,用户的扩展信息中,登录皮肤和首页布局更改为下拉选择框



See merge request !508
@@ -306,7 +306,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -306,7 +306,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
306 ' <option value="" style="display:none;"></option>'+ selectOption + 306 ' <option value="" style="display:none;"></option>'+ selectOption +
307 '</select>'; 307 '</select>';
308 }else{ 308 }else{
  309 + if(v.ddicCode=="loginSkin"){
  310 + var selectOption=' <option value="default">默认布局</option>'+
  311 + ' <option value="skin1">skin1</option>'+
  312 + ' <option value="skin2">skin2</option>';
  313 +
  314 + str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
  315 + ' <option value="" style="display:none;"></option>'+ selectOption +
  316 + '</select>';
  317 + }else if(v.ddicCode=="userLayout"){
  318 + var selectOption=' <option value="layout">默认布局</option>'+
  319 + ' <option value="layout-nx">layout-nx</option>';
  320 +
  321 + str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
  322 + ' <option value="" style="display:none;"></option>'+ selectOption +
  323 + '</select>';
  324 + }else{
309 str='<input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input input" name="' + v.ddicCode + '" autocomplete="off">' 325 str='<input type="text" data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="layui-input input" name="' + v.ddicCode + '" autocomplete="off">'
  326 +
  327 + }
310 } 328 }
311 var property = ' <div class="layui-inline ">' + 329 var property = ' <div class="layui-inline ">' +
312 ' <label class="layui-form-label">' + v.ddicName + '</label>' + 330 ' <label class="layui-form-label">' + v.ddicName + '</label>' +