eoss-ui 0.5.68 → 0.5.70

package/lib/wxlogin.js

@@ -154,21 +154,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
-var pendingRequest = new Map();
-function getRequestKey(config) {
-  var method = config.method,
-      url = config.url,
-      params = config.params,
-      data = config.data;
-
-  return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
-};
-function delPendingRequest(config) {
-  var requestKey = getRequestKey(config);
-  if (pendingRequest.has(requestKey)) {
-    pendingRequest.delete(requestKey);
-  }
-}
+// const pendingRequest = new Map();
+// function getRequestKey(config) {
+//   const { method, url, params, data } = config;
+//   return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
+// };
+// function delPendingRequest(config) {
+//   let requestKey = getRequestKey(config);
+//   if (pendingRequest.has(requestKey)) {
+//     pendingRequest.delete(requestKey);
+//   }
+// }
 var ajax = function ajax(_ref) {
   var headers = _ref.headers,
       method = _ref.method,
@@ -217,30 +213,32 @@ var ajax = function ajax(_ref) {
   http.interceptors.request.use(function (config) {
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
-    var requestKey = getRequestKey(config);
-    // 判断请求是否重复
-    if (pendingRequest.has(requestKey)) {
-      // 取消上次请求
-      var cancel = pendingRequest.get(requestKey);
-      cancel();
-      // 删除请求信息
-      pendingRequest.delete(requestKey);
-    }
-    // 把请求信息,添加请求到map当中
-    // 生成取消方法
-    config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
-      // 把取消方法添加到map
-      if (!pendingRequest.has(requestKey)) {
-        pendingRequest.set(requestKey, cancel);
-      }
-    });
+    // let requestKey = getRequestKey(config);
+    // // 判断请求是否重复
+    // if (pendingRequest.has(requestKey)) {
+    //   // 取消上次请求
+    //   let cancel = pendingRequest.get(requestKey);
+    //   cancel();
+    //   // 删除请求信息
+    //   pendingRequest.delete(requestKey);
+    // }
+    // // 把请求信息,添加请求到map当中
+    // // 生成取消方法
+    // config.cancelToken =
+    //   config.cancelToken ||
+    //   new axios.CancelToken(cancel => {
+    //     // 把取消方法添加到map
+    //     if (!pendingRequest.has(requestKey)) {
+    //       pendingRequest.set(requestKey, cancel);
+    //     }
+    //   });
     return config;
   }, function (err) {
     return err;
   });
   // 响应拦截
   http.interceptors.response.use(function (response) {
-    delPendingRequest(response.config);
+    // delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
       if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
@@ -357,9 +355,9 @@ var ajax = function ajax(_ref) {
     }
   }, function (error) {
     loading && loading.close();
-    if (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
-      delPendingRequest(error.config || {});
-    }
+    // if (!axios.isCancel(error)) {
+    //   delPendingRequest(error.config || {});
+    // }
     if (error && error.response) {
       if (error.response.status) {
         switch (error.response.status) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.68",
+  "version": "0.5.70",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.96",
+    "eoss-element": "^0.2.98",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/checkbox-group/src/main.vue

@@ -55,6 +55,7 @@
 
 <script>
 import { findSysCode, getDictList } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
@@ -239,12 +240,17 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    this.getData = debounce(300, (url, sysCode) => {
+      this.getDatas(url, sysCode);
+    });
+  },
   created() {
     this.bindEventBus();
   },
   mounted() {},
   methods: {
-    getData(url, sysCode) {
+    getDatas(url, sysCode) {
       let params = {};
       if (this.results.length === 0) {
         params = util.extend(

package/packages/data-table/src/main.vue

@@ -83,7 +83,9 @@
             <el-table-column
               v-if="item.type === 'sort'"
               width="32"
-              :key="index"
+              prop="id"
+              :key="item.key || index"
+              label=" "
             >
               <template slot-scope="scope">
                 <es-icon class="es-move" :contents="dragSortIcon"></es-icon>
@@ -91,7 +93,7 @@
             </el-table-column>
             <el-table-column
               v-else-if="item.type === 'index' || item.type === 'selection'"
-              :key="index"
+              :key="item.key || index"
               v-bind="dragSort ? { ...item, fixed: false } : item"
             ></el-table-column>
             <children
@@ -487,7 +489,8 @@ export default {
           });
         if (this.dragSort && !types.includes('sort')) {
           thead.push({
-            type: 'sort'
+            type: 'sort',
+            key: 'es-sort'
           });
         }
         if (this.checkbox && !types.includes('selection')) {
@@ -497,7 +500,8 @@ export default {
             align: 'center',
             fixed: 'left',
             selectable: this.selectable,
-            reserveSelection: this.reserveSelection
+            reserveSelection: this.reserveSelection,
+            key: 'es-checkbox'
           });
         }
         if (this.numbers && !types.includes('index')) {
@@ -517,7 +521,8 @@ export default {
             align: 'center',
             fixed: 'left',
             index: index,
-            filterIcon: this.filter ? 'es-icon-biao' : undefined
+            filterIcon: this.filter ? 'es-icon-biao' : undefined,
+            key: 'es-index'
           });
         }
         if (this.theadData.length) {
@@ -716,10 +721,12 @@ export default {
       }
     }
   },
-  created() {
+  beforeCreate() {
     this.getTableData = debounce(300, (res) => {
       this.getTableDatas(res);
     });
+  },
+  created() {
     if (Array.isArray(this.thead) && this.thead.length) {
       this.getOptions(this.thead);
     }

package/packages/dialog/src/main.vue

@@ -10,13 +10,11 @@
     :drag="drag"
     :modal-append-to-body="modalAppendToBody"
     v-bind="$attrs"
-    v-on="$listeners"
+    v-on="{ ...$listeners, close: handleClosed, scale: handleScale }"
     :class="{ 'is-middle': middle }"
     :append-to-body="appendToBody"
     :id="wujieName"
     :ref="wujieName"
-    @close="handleClosed"
-    @scale="handleScale"
   >
     <slot></slot>
     <template v-if="contents">
@@ -449,6 +447,7 @@ export default {
       this.show = false;
       this.$emit('close', res, this);
       if (this.closeParent && this.esDialog) {
+        console.log(12121);
         this.esDialog.handleClosed(res);
       }
     },

package/packages/form/src/main.vue

@@ -4002,6 +4002,7 @@
 </template>
 <script>
 import { formContents } from 'eoss-ui/src/config/api.js';
+import { debounce } from 'throttle-debounce';
 import util from 'eoss-ui/src/utils/util';
 import rules from 'eoss-ui/src/utils/rules.js';
 export default {
@@ -4506,6 +4507,14 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    this.getContent = debounce(300, () => {
+      this.getContents();
+    });
+    this.getValue = debounce(300, () => {
+      this.getValues();
+    });
+  },
   created() {
     this.dialog =
       window.$wujie && window.$wujie.props
@@ -4548,7 +4557,7 @@ export default {
       }
       return this.getParentHeight(dom.parentNode);
     },
-    getContent() {
+    getContents() {
       if (
         typeof this.contents === 'string' ||
         (util.isObject(this.contents) &&
@@ -4649,7 +4658,7 @@ export default {
         }
       }
     },
-    getValue() {
+    getValues() {
       if (typeof this.model === 'string') {
         this.loading = true;
         let param = this.paramId

package/packages/icon/src/main.vue

@@ -7,7 +7,6 @@
   </i>
 </template>
 <script>
-import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsIcon',
   inheritAttrs: false,
@@ -21,7 +20,7 @@ export default {
       handler(val) {
         if (val) {
           if (typeof val == 'string') {
-            if (util.startWith(val, '&#')) {
+            if (!this.unicode(val)) {
               this.code = val;
               this.className = 'es-icon';
             } else {
@@ -44,6 +43,14 @@ export default {
     };
   },
   created() {},
-  methods: {}
+  methods: {
+    unicode(res) {
+      if (!res) {
+        return false;
+      }
+      var reg = new RegExp(/^es-\S+/, 'g');
+      return res.match(reg) ? res.match(reg).length : 0;
+    }
+  }
 };
 </script>

package/packages/icons/src/icon.json

@@ -1 +1 @@
-["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","home","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key"]
+["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","home","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key","wenjianjiadakai"]

package/packages/input/src/main.vue

@@ -1,4 +1,5 @@
 <script>
+import { debounce } from 'throttle-debounce';
 import util from 'eoss-ui/src/utils/util';
 import rules from 'eoss-ui/src/utils/rules.js';
 export default {
@@ -127,9 +128,15 @@ export default {
       return undefined;
     }
   },
+  beforeCreate() {
+    this.getData = debounce(300, (query, callback, isChange) => {
+      this.getDatas(query, callback, isChange);
+    });
+  },
+  created() {},
   mounted() {},
   methods: {
-    getData(query, callback, isChange) {
+    getDatas(query, callback, isChange) {
       if (typeof this.url && this.results.length === 0) {
         util
           .ajax({

package/packages/login/src/main.vue

@@ -30,7 +30,7 @@
           <i
             v-for="(item, index) in icons"
             v-show="switchs > 2 || active != item.type"
-            @click="switchLogin(item.type)"
+            @click="switchLogin(item)"
             :title="switchs > 2 ? item.name : ''"
             :key="index"
             :class="[
@@ -43,9 +43,13 @@
         <div class="es-login-form-box">
           <template v-if="isShow(active) && (active == 0 || active == 12)">
             <el-form ref="login" class="es-login-form" :model="formData">
-              <div class="es-login-title" v-if="!loginTitleImg">
-                <span class="es-login-title-content">{{ title }}</span>
-              </div>
+              <template v-if="!loginTitleImg">
+                <slot name="login-title" :type="active">
+                  <div class="es-login-title">
+                    <span class="es-login-title-content">{{ title }}</span>
+                  </div>
+                </slot>
+              </template>
               <el-form-item
                 size="large"
                 prop="username"
@@ -151,11 +155,13 @@
             v-if="isShow(active) && (active == 3 || active == 7 || active == 9)"
           >
             <div class="es-login-qrcode">
-              <div class="es-login-title" v-if="!loginTitleImg">
-                <div class="es-login-title-content">
-                  {{ iconfonts[active].name }}
-                </div>
-              </div>
+              <template v-if="!loginTitleImg">
+                <slot name="login-title" :type="active">
+                  <div class="es-login-title">
+                    <span class="es-login-title-content">{{ title }}</span>
+                  </div>
+                </slot>
+              </template>
               <div class="es-login-down-app">
                 打开
                 <template v-if="active == 3">
@@ -199,11 +205,13 @@
               class="es-login-form es-login-verify"
               :model="formData"
             >
-              <div class="es-login-title" v-if="!loginTitleImg">
-                <span class="es-login-title-content">{{
-                  iconfonts[active].name
-                }}</span>
-              </div>
+              <template v-if="!loginTitleImg">
+                <slot name="login-title" :type="active">
+                  <div class="es-login-title">
+                    <span class="es-login-title-content">{{ title }}</span>
+                  </div>
+                </slot>
+              </template>
               <el-form-item
                 size="large"
                 prop="target"
@@ -370,10 +378,6 @@ export default {
       type: String,
       default: 'default'
     },
-    title: {
-      type: String,
-      default: '账号登录'
-    },
     param: {
       type: Object,
       default() {
@@ -627,11 +631,7 @@ export default {
             6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
             7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
             9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-            11: {
-              type: '11',
-              icon: 'es-icon-wodeyouxiang',
-              name: '邮箱登录'
-            },
+            11: { type: '11', icon: 'es-icon-wodeyouxiang', name: '邮箱登录' },
             12: { type: '12', icon: 'es-icon-jianpan', name: '账号登录' } //双因素
           };
     },
@@ -663,6 +663,7 @@ export default {
       immediate: true,
       handler(val) {
         this.active = val.split(',')[0];
+        this.title = this.iconfonts[this.active].name;
       }
     },
     active: {
@@ -711,6 +712,7 @@ export default {
   },
   data() {
     return {
+      title: '',
       align: this.position,
       loginBackgroundImg: this.loginBackground,
       loginMainImg: this.loginImage,
@@ -781,12 +783,17 @@ export default {
       document.addEventListener('keyup', this.doLogin);
       document.addEventListener('keydown', this.forbiddenTab);
     }
+    this.init();
   },
   mounted() {
     this.getRemember();
     delete util.win.websocket;
   },
   methods: {
+    init() {
+      let loginBoxAlign = localStorage.getItem('loginBoxAlign');
+      loginBoxAlign && (this.align = loginBoxAlign);
+    },
     doWechatLogin(code) {
       util
         .ajax({
@@ -940,7 +947,8 @@ export default {
       //this.$refs.login && this.$refs.login.resetFields();
       this.$refs.login && this.$refs.login.clearValidate();
       if (res != 1) {
-        this.active = res;
+        this.active = res.type;
+        this.title = res.name;
         Object.keys(this.defaultModel).length &&
           (this.formData = JSON.parse(JSON.stringify(this.defaultModel)));
       }
@@ -1042,6 +1050,10 @@ export default {
           this.loginNameImg = res.subsystemExtend.loginBoxName;
         }
         if (res.subsystemExtend.loginBoxAlign && this.useResults) {
+          localStorage.setItem(
+            'loginBoxAlign',
+            res.subsystemExtend.loginBoxAlign
+          );
           this.align = res.subsystemExtend.loginBoxAlign;
         }
         if (res.subsystemExtend.copyrightColor) {

package/packages/main/src/main.vue

@@ -23,6 +23,8 @@
           class="es-fourth-tabs"
           mode="horizontal"
           :icons="icons"
+          :menu-icon="menuIcon"
+          :sub-icon="subIcon"
           :popperClass="`el-menu--popup-${layout}`"
           :data="navs"
           :deep="layout === 'topnav'"
@@ -82,6 +84,7 @@
           </div>
           <es-handle-user
             :data="{ type: 'user' }"
+            :userModel="userModel"
             @click="handleClick"
           ></es-handle-user>
         </div>
@@ -115,13 +118,17 @@
           :is-top="layout == 'topside'"
           :data="menu"
           :default-active="active"
-          :width="navWidth"
+          :width="navsWidth"
+          :nav-width="navWidth"
           :icons="icons"
+          :menu-icon="menuIcon"
+          :sub-icon="subIcon"
           :biserial="biserial"
           :title="showNavTitle ? title : false"
           :showCollapse="showNavTitle"
           :menu-tips="menuTips"
           :is-default="isDefault"
+          :paddingLeft="navPaddingLeft"
           @open="
             (res) => {
               handleSelect(res, 'menu', true);
@@ -147,6 +154,7 @@
             :data="tabs"
             :titleIcons="false"
             :default-active="tabsId"
+            :menu-icon="menuIcon"
             :menu-tips="menuTips"
             @select="
               (res) => {
@@ -288,8 +296,15 @@ export default {
     maxHeight: String,
     //菜单导航地址
     menuUrl: String,
-    //菜单展开关闭
+    //菜单展开关闭图标
     icons: Object,
+    //菜单前置默认图标
+    menuIcon: String,
+    //子菜单是否显示前置图标
+    subIcon: {
+      type: Boolean,
+      default: true
+    },
     //logo
     logo: String,
     //菜单显示类型
@@ -413,7 +428,10 @@ export default {
       type: [Boolean, String],
       default: true
     },
-    appCode: String
+    appCode: String,
+    //菜单左边距
+    navPaddingLeft: Number,
+    navWidth: String
   },
   computed: {
     showHeader() {
@@ -444,7 +462,7 @@ export default {
       }
       return true;
     },
-    navWidth() {
+    navsWidth() {
       return this.layout === 'topside' ? '230px' : undefined;
     },
     showNavTitle() {
@@ -1852,8 +1870,12 @@ export default {
                 }
               }
             } else {
-              console.error('缺少路由配置');
-              return;
+              this.method = 'iframe';
+              this.refresh = false;
+              this.page = util.handlerUrl(page, param);
+              this.$nextTick(() => {
+                this.refresh = true;
+              });
             }
           }
         }