eoss-ui 0.5.71 → 0.5.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.71",
+  "version": "0.5.72",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/cascader/src/main.vue

@@ -92,7 +92,26 @@ export default {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    getLabel(val, data) {
+      let label = '';
+      for (let i = 0; i < data.length; i++) {
+        let item = data[i];
+        if (val == item[this.newProps.value]) {
+          label = item[this.newProps.label];
+          break;
+        } else {
+          if (item.children && item.children.length) {
+            label = this.getLabel(val, item.children);
+            if (label) {
+              break;
+            }
+          }
+        }
+      }
+      return label;
+    }
+  },
   render(h) {
     if (!this.hide) {
       if (this.readonly) {
@@ -105,7 +124,7 @@ export default {
                     return item
                       .map((ele) => {
                         if (typeof ele === 'string') {
-                          return ele;
+                          return this.getLabel(ele, this.datas);
                         } else {
                           return ele[this.newProps.label];
                         }
@@ -113,7 +132,7 @@ export default {
                       .join(this.separator);
                   } else {
                     if (typeof item === 'string') {
-                      return item;
+                      return this.getLabel(item, this.datas);
                     } else {
                       return item[this.newProps.label];
                     }

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

@@ -456,7 +456,7 @@ export default {
       show: true,
       sysCodes: [],
       infiniteDisabled: this.infiniteScroll,
-      isUpadeData: false
+      isReload: false
     };
   },
   computed: {
@@ -673,7 +673,7 @@ export default {
     param: {
       deep: true,
       handler(val) {
-        this.getTableData(112);
+        this.getTableData();
       }
     },
     page: {
@@ -1011,6 +1011,10 @@ export default {
         .then((res) => {
           this.tableLoading = false;
           if (res.rCode === 0 || res.status === 'success') {
+            if (this.isReload) {
+              this.list = [];
+              this.isReload = false;
+            }
             let results =
               this.parseData !== undefined
                 ? this.parseData(res.results || res.data || res)
@@ -1021,10 +1025,13 @@ export default {
               );
               this.config.pageNum += 1;
             } else {
-              this.list = results.data || results.records || results.list || [];
-              this.$refs.oaTable &&
-                this.$refs.oaTable.resetScroll &&
-                this.$refs.oaTable.resetScroll(0, 0);
+              this.$nextTick(() => {
+                this.list =
+                  results.data || results.records || results.list || [];
+                this.$refs.oaTable &&
+                  this.$refs.oaTable.resetScroll &&
+                  this.$refs.oaTable.resetScroll(0, 0);
+              });
             }
             this.config.totalCount =
               results.count || results.total || results.totalCount;
@@ -1444,6 +1451,7 @@ export default {
         this.config = util.extend({}, this.config, obj.config);
       }
       if (this.url) {
+        this.isReload = true;
         this.getTableData({ where: obj && obj.where ? obj.where : {}, first });
       }
     },

package/packages/dialog/src/main.vue

@@ -447,7 +447,6 @@ export default {
       this.show = false;
       this.$emit('close', res, this);
       if (this.closeParent && this.esDialog) {
-        console.log(12121);
         this.esDialog.handleClosed(res);
       }
     },

package/packages/icon/src/main.vue

@@ -24,6 +24,7 @@ export default {
               this.code = val;
               this.className = 'es-icon';
             } else {
+              this.code = '';
               this.className = val;
             }
           } else {

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","wenjianjiadakai"]
+["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","yingyonglan"]

package/packages/login/src/main.vue

@@ -60,6 +60,7 @@
                   size="large"
                   type="text"
                   name="username"
+                  tabindex="1"
                   exclude
                   :placeholder="username.placeholder"
                   :focusShow="focusShow"
@@ -81,6 +82,7 @@
                   v-model="formData.password"
                   size="large"
                   name="password"
+                  tabindex="2"
                   type="password"
                   :placeholder="password.placeholder"
                   autocomplete="off"
@@ -106,6 +108,7 @@
                 <el-input
                   size="large"
                   name="identifyingCode"
+                  tabindex="3"
                   type="text"
                   v-model="formData.identifyingCode"
                   placeholder="请输入验证码"
@@ -222,6 +225,7 @@
                   size="large"
                   type="text"
                   name="target"
+                  tabindex="4"
                   :placeholder="
                     active == 6 ? phone.placeholder : email.placeholder
                   "
@@ -245,6 +249,7 @@
                   placeholder="请输入验证码"
                   autocomplete="off"
                   class="es-label-image-code"
+                  tabindex="5"
                 >
                   <template slot="prefix">
                     <i class="es-icon-yanzheng es-label-code-image"></i>

package/packages/main/src/main.vue

@@ -78,7 +78,10 @@
     </div>
     <div class="es-main-box" v-if="reset">
       <div class="es-main-left" v-if="layout !== 'topnav' && showSide">
-        <div class="es-main-side" v-if="layout === 'topside'">
+        <div
+          class="es-main-side"
+          v-if="layout === 'topside' || layout === 'side'"
+        >
           <div class="es-main-side-logo">
             <img class="es-main-logo" :src="logoUrl" v-if="logoUrl" />
           </div>
@@ -116,10 +119,11 @@
         <es-nav
           v-if="showMenu && showDefault"
           :is-top="layout == 'topside'"
+          :overlap="layout == 'side'"
           :data="menu"
           :default-active="active"
           :width="navsWidth"
-          :nav-width="navWidth"
+          :nav-width="_navWidth"
           :icons="icons"
           :menu-icon="menuIcon"
           :sub-icon="subIcon"
@@ -220,13 +224,6 @@
         </div>
       </div>
     </div>
-    <!-- <div v-show="set" ref="box" class="es-sets-button">
-      <el-button
-        type="primary"
-        class="es-icon-xitongguanli"
-        ref="area"
-      ></el-button>
-    </div> -->
     <settings
       v-bind="$attrs"
       :theme="color"
@@ -431,6 +428,10 @@ export default {
     appCode: String,
     //菜单左边距
     navPaddingLeft: Number,
+    navBoxWidth: {
+      type: String,
+      default: '230px'
+    },
     navWidth: String
   },
   computed: {
@@ -463,10 +464,17 @@ export default {
       return true;
     },
     navsWidth() {
-      return this.layout === 'topside' ? '230px' : undefined;
+      return this.layout === 'topside' ? this.navBoxWidth : undefined;
+    },
+    _navWidth() {
+      return this.layout === 'side'
+        ? this.navBoxWidth
+        : this.layout === 'subsystem' || this.layout === 'topside'
+        ? '0'
+        : this.navWidth;
     },
     showNavTitle() {
-      return this.layout !== 'topside';
+      return this.layout !== 'topside' && this.layout !== 'side';
     },
     //tabs菜单
     fourthTabs() {
@@ -518,7 +526,7 @@ export default {
         } else {
           return { set: !this.set, system: false };
         }
-      } else if (this.layout === 'topside') {
+      } else if (this.layout === 'topside' || this.layout === 'side') {
         if (this.hides && Object.keys(this.hides).length) {
           return {
             ...this.hides,
@@ -1368,6 +1376,7 @@ export default {
           }
         }
       } else {
+        this.tabs = [];
         this.handleJump(obj.url, obj.urlopenmode, obj);
       }
       return obj;

package/packages/main/src/settings.vue

@@ -89,6 +89,19 @@
             <i class="es-icon-gou" v-show="activeName == 'topside'"></i>
           </div>
         </el-tooltip>
+        <el-tooltip
+          class="es-setting-navs-item"
+          effect="dark"
+          content="侧边菜单布局"
+          placement="bottom"
+        >
+          <div
+            class="es-setting-navs es-setting-side-navs"
+            @click.stop="handleLayout('side')"
+          >
+            <i class="es-icon-gou" v-show="activeName == 'side'"></i>
+          </div>
+        </el-tooltip>
       </div>
     </div>
   </el-drawer>

package/packages/nav/src/main.vue

@@ -5,8 +5,21 @@
     :class="biserial ? 'es-nav-biserial' : ''"
     :style="{ width: boxWidth, height: height }"
   >
-    <div class="es-nav-initial" v-if="biserial">
+    <div
+      class="es-nav-initial"
+      v-if="biserial"
+      :style="{
+        width: _navWidth,
+        left:
+          this.overlap && !this.subMenu.length
+            ? '15px'
+            : show
+            ? '-' + boxWidth
+            : ''
+      }"
+    >
       <es-menu
+        :class="{ 'es-nav-overlap': overlap }"
         v-bind="$attrs"
         sub-nav
         :data="menu"
@@ -22,8 +35,12 @@
     </div>
     <div
       class="es-nav-main"
+      :class="{ 'es-nav-overlap': overlap }"
       :biserial="biserial"
-      :style="{ width: biserial ? width : boxWidth }"
+      :style="{
+        width: biserial ? width : boxWidth,
+        left: show ? '15px' : navWidth
+      }"
       v-show="biserial ? subMenu.length : menu.length"
     >
       <div class="es-nav-title" v-if="showTitle">
@@ -60,6 +77,15 @@
         @close="handleClose"
       ></es-menu>
     </div>
+
+    <div v-show="show" ref="box" class="es-sets-button">
+      <el-button
+        round
+        type="primary"
+        class="es-icon-yingyonglan"
+        ref="area"
+      ></el-button>
+    </div>
   </div>
 </template>
 <script>
@@ -103,9 +129,13 @@ export default {
     subIcon: {
       type: Boolean,
       default: true
-    }
+    },
+    overlap: Boolean
   },
   computed: {
+    show() {
+      return this.overlap && this.subMenu.length;
+    },
     menu() {
       return this.data;
     },
@@ -135,15 +165,23 @@ export default {
     },
     boxWidth() {
       if (!this.biserial) {
+        if (this.overlap) {
+          return this.navWidth;
+        }
         if (this.isShow) {
           return this.width;
         } else {
           return this.navWidth;
         }
       }
-      return this.subMenu && this.subMenu.length && this.isShow
+      return this.subMenu && this.subMenu.length && this.isShow && !this.overlap
         ? parseInt(this.width, 10) + parseInt(this.navWidth, 10) + 'px'
         : this.navWidth;
+    },
+    _navWidth() {
+      return this.overlap
+        ? parseInt(this.navWidth, 10) - 30 + 'px'
+        : this.navWidth;
     }
   },
   watch: {
@@ -224,8 +262,61 @@ export default {
   },
   mounted() {
     this.resetHeight();
+    this.move();
   },
   methods: {
+    //设置按钮拖动
+    move() {
+      let area = this.$refs.area.$el;
+      let box = this.$refs.box;
+      let [sTime, eTime] = [0, 0];
+      area.addEventListener('mousedown', (e) => {
+        sTime = new Date().getTime();
+        let { y: downY, x: downX } = e;
+        let { height: winH, width: winW } =
+          document.body.getBoundingClientRect();
+        //防止拖动期间选中和复制网页文本
+        document.body.onselectstart = document.body.oncontextmenu = () => {
+          return false;
+        };
+        document.onmousemove = (eve) => {
+          let size = 40;
+          let { y: moveY, x: moveX } = eve;
+          let { top: boxTop, left: boxLeft } = box.getBoundingClientRect();
+          boxTop += moveY - downY;
+          boxLeft += moveX - downX;
+          boxTop >= winH - size && (boxTop = winH - size);
+          boxTop <= -size && (boxTop = -size);
+          boxLeft >= winW - size && (boxLeft = winW - size);
+          boxLeft <= -size && (boxLeft = -size);
+          if (boxTop < 0) {
+            boxTop = 0;
+          }
+          if (boxLeft < 0) {
+            boxLeft = 0;
+          }
+          box.style.top = boxTop + 'px';
+          box.style.left = boxLeft + 'px';
+          downY = moveY;
+          downX = moveX;
+        };
+        document.onmouseup = () => {
+          eTime = new Date().getTime();
+          let isClick = eTime - sTime < 200;
+          if (isClick) {
+            let onArea = () => {
+              this.subMenu = [];
+              area.removeEventListener('click', onArea);
+            };
+            area.addEventListener('click', onArea);
+          }
+          document.onmousemove = null;
+          document.body.onselectstart = document.body.oncontextmenu = () => {
+            return true;
+          };
+        };
+      });
+    },
     handleChange() {
       if (this.biserial) {
         this.isShow = !this.isShow;
@@ -233,7 +324,7 @@ export default {
         this.isCollapse = !this.isCollapse;
         if (this.isCollapse) {
           this.isShow = false;
-          this.menuWidth = '70px';
+          this.menuWidth = this.navWidth;
         } else {
           this.isShow = true;
           this.menuWidth = this.width;
@@ -270,6 +361,9 @@ export default {
             height -= item.offsetHeight + mt + mb;
           }
         });
+        if (this.overlap) {
+          height -= 15;
+        }
         this.height = height + 'px';
         this.menuHeight = this.showTitle ? height - 49 + 'px' : height + 'px';
       });

package/packages/select/src/main.vue

@@ -200,7 +200,6 @@ export default {
       immediate: true,
       handler(val, old) {
         if (val && val !== old) {
-          console.log(1);
           this.label = this.service ? 'label' : 'shortName';
           this.valKey = this.service ? 'value' : 'cciValue';
           const options = store.get(val);
@@ -222,7 +221,6 @@ export default {
     param: {
       deep: true,
       handler(val, old) {
-        console.log(3);
         if (this.url && JSON.stringify(val) !== JSON.stringify(old)) {
           this.options = [];
           this.getData(this.sysCode);