eoss-ui 0.5.67 → 0.5.69

package/lib/upload.js

@@ -3828,8 +3828,8 @@ module.exports = require("js-base64");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=031cebad&
-var mainvue_type_template_id_031cebad_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=33bc9a52&
+var mainvue_type_template_id_33bc9a52_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3843,7 +3843,7 @@ var mainvue_type_template_id_031cebad_render = function () {
             class: [
               {
                 "es-avatar-uploader": _vm.portrait,
-                "es-upload-readonly": _vm.isReadonly,
+                "es-upload-readonly": _vm.isReadonly && !_vm.downloads,
               },
               "es-upload-" + _vm.listType,
             ],
@@ -4210,10 +4210,10 @@ var mainvue_type_template_id_031cebad_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_031cebad_render._withStripped = true
+mainvue_type_template_id_33bc9a52_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=031cebad&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=33bc9a52&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -5315,7 +5315,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_031cebad_render,
+  mainvue_type_template_id_33bc9a52_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.67",
+  "version": "0.5.69",
   "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.95",
+    "eoss-element": "^0.2.97",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/button/src/main.vue

@@ -268,7 +268,11 @@ export default {
     let config = {};
     if (this.selector) {
       tag = 'es-selector';
-      props = { ...this.$attrs, button: { type: this._type, size: this.size } };
+      props = {
+        reset: true,
+        ...this.$attrs,
+        button: { type: this._type, size: this.size }
+      };
       listeners = this.$listeners;
     } else if (this.upload) {
       tag = 'es-upload';

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

@@ -7,12 +7,17 @@
             v-if="item.upload || (item.code && item.ownId)"
             class="el-button"
             v-bind="{
-              ...item,
+              ...exclAttribute({
+                data: item,
+                attrs: ['events']
+              }),
+              ...parseProps(),
               method: 'post',
               btnSize: size,
               showFileList: false,
               selectType: item.type ? item.type : ''
             }"
+            v-on="item.events"
           ></es-upload>
           <es-button
             v-else
@@ -40,6 +45,7 @@
     </template>
     <el-dropdown
       v-if="other.length > 0"
+      ref="dropdown"
       @command="handleCommand"
       @visible-change="handleChange"
       :trigger="trigger"
@@ -61,12 +67,53 @@
           v-for="(item, index) in other"
           :key="index"
           :command="item"
+          :class="{ 'es-dropdown-padding': item.upload || item.selector }"
         >
-          <i :class="item.icon" v-if="item.icon"></i
-          >{{
-            item.template ? item.template({ ...data, config: item }) : item.text
-          }}</el-dropdown-item
-        >
+          <es-upload
+            v-if="item.upload || (item.code && item.ownId)"
+            class="es-dropdown-upload"
+            v-bind="{
+              ...exclAttribute({
+                data: item,
+                attrs: ['events']
+              }),
+              ...parseProps(),
+              method: 'post',
+              showFileList: false,
+              selectType: 'text'
+            }"
+            v-on="item.events"
+          ></es-upload>
+          <es-selector
+            v-else-if="item.selector"
+            class="es-dropdown-selector"
+            v-bind="{
+              reset: true,
+              ...exclAttribute({
+                data: item,
+                attrs: ['events', 'type', 'value']
+              }),
+              businessData: data
+            }"
+            v-on="item.events"
+            :button="{ size: 'medium', type: 'text' }"
+          >
+            <i :class="item.icon" v-if="item.icon"></i
+            >{{
+              item.template
+                ? item.template({ ...data, config: item })
+                : item.text
+            }}
+          </es-selector>
+          <template v-else>
+            <i :class="item.icon" v-if="item.icon"></i
+            >{{
+              item.template
+                ? item.template({ ...data, config: item })
+                : item.text
+            }}
+          </template>
+        </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
   </el-button-group>
@@ -103,7 +150,8 @@ export default {
     placement: {
       type: String,
       default: 'bottom'
-    }
+    },
+    parseData: Function
   },
   computed: {
     btns() {
@@ -175,6 +223,10 @@ export default {
       this.$emit('handle-click', obj);
     },
     handleCommand(res) {
+      if (res.upload || res.selector) {
+        this.$refs.dropdown.hide();
+        return false;
+      }
       this.$emit('handleClick', { ...this.data, handle: res });
       this.$emit('handle-click', { ...this.data, handle: res });
     },
@@ -192,6 +244,9 @@ export default {
           this.$emit('input', w + 'px');
         }
       });
+    },
+    parseProps() {
+      return this.parseData && this.data ? this.parseData(this.data) : {};
     }
   }
 };

package/packages/calendar/src/main.vue

@@ -22,7 +22,7 @@
         {{ item }}
       </li>
     </ul>
-    <ul class="es-calendar-days">
+    <ul class="es-calendar-days" :style="{ height: _height }">
       <li
         class="es-day"
         @click="handleClick(item)"
@@ -80,7 +80,8 @@ export default {
       default: true
     },
     mark: Boolean,
-    disabled: Boolean
+    disabled: Boolean,
+    height: String
   },
   watch: {
     date: {
@@ -117,6 +118,9 @@ export default {
           }
         }
       });
+    },
+    _height() {
+      return this.height && this.all ? parseInt(this.height) + 'px' : '';
     }
   },
   data() {

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

@@ -479,7 +479,7 @@ export default {
     width: [Number, String],
     minWidth: [Number, String],
     hide: Boolean,
-    showOverflowTooltip: Boolean,
+    showOverflowTooltip: [Boolean, Number],
     render: [Function, String],
     contents: Array,
     events: [Array, Object],

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) {

package/packages/form/src/main.vue

@@ -4178,7 +4178,8 @@ export default {
       default() {
         return {};
       }
-    }
+    },
+    active: Array
   },
   data() {
     return {
@@ -4393,7 +4394,7 @@ export default {
                     if (index === 0) {
                       names = item.name || String(index);
                     }
-                  } else {
+                  } else if (item.active !== false) {
                     names.push(item.name || String(index));
                   }
                 } else {
@@ -4402,7 +4403,9 @@ export default {
                 contents.push(item);
               }
             });
-            this.activeNames = names;
+            if (!this.active || (this.active && !this.active.length)) {
+              this.activeNames = names;
+            }
             this.content = contents;
             if (this.content.length === 1) {
               if (
@@ -4492,6 +4495,15 @@ export default {
     },
     readonly() {
       !this.height && this.getHeight();
+    },
+    active: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        if (val && val.length) {
+          this.activeNames = val;
+        }
+      }
     }
   },
   created() {
@@ -4605,7 +4617,7 @@ export default {
                 if (index === 0) {
                   names = item.name || String(index);
                 }
-              } else {
+              } else if (item.active !== false) {
                 names.push(item.name || String(index));
               }
             } else {
@@ -4614,7 +4626,9 @@ export default {
             contents.push(util.extend({}, item));
           }
         });
-        this.activeNames = names;
+        if (!this.active || (this.active && !this.active.length)) {
+          this.activeNames = names;
+        }
         this.content = contents;
         if (
           this.content.length === 1 &&

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/login/src/main.vue

@@ -2,11 +2,9 @@
   <div
     v-if="!code"
     class="es-login-screen"
-    :style="{
-      'background-image': getImgUrl(loginBackgroundUrl)
-    }"
+    :style="getBackground(loginBackgroundImg)"
   >
-    <img v-if="loginLogoUrl" class="es-login-logo" :src="loginLogoUrl" />
+    <img v-if="loginLogoImg" class="es-login-logo" :src="loginLogoImg" />
     <slot></slot>
     <div
       class="es-login"
@@ -17,15 +15,10 @@
       :class="{ 'es-simple': mode == 'simple' }"
       :style="transform"
     >
-      <img v-if="loginNameUrl" class="es-login-name" :src="loginNameUrl" />
-      <div
-        class="es-login-main"
-        :style="{
-          'background-image': getImgUrl(loginImageUrl)
-        }"
-      >
-        <div v-if="loginTitleUrl" class="es-login-title-image">
-          <img class="es-login-title-img" :src="loginTitleUrl" />
+      <img v-if="loginNameImg" class="es-login-name" :src="loginNameImg" />
+      <div class="es-login-main" :style="getBackground(loginMainImg)">
+        <div v-if="loginTitleImg" class="es-login-title-image">
+          <img class="es-login-title-img" :src="loginTitleImg" />
         </div>
         <div
           v-if="switchs > 1"
@@ -50,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="!loginTitleUrl">
-                <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"
@@ -158,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="!loginTitleUrl">
-                <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">
@@ -206,11 +205,13 @@
               class="es-login-form es-login-verify"
               :model="formData"
             >
-              <div class="es-login-title" v-if="!loginTitleUrl">
-                <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"
@@ -387,8 +388,8 @@ export default {
         return {};
       }
     },
-    loginBackground: [String, Array],
-    loginImage: [String, Array],
+    loginBackground: [String, Array, Object],
+    loginImage: [String, Array, Object],
     loginLogo: String,
     loginTitle: String,
     loginName: String,
@@ -602,23 +603,6 @@ export default {
         return window.location.href || window.href;
       }
     },
-    loginBackgroundUrl() {
-      return this.loginBackground
-        ? this.loginBackground
-        : this.loginBackgroundImg;
-    },
-    loginImageUrl() {
-      return this.loginImage ? this.loginImage : this.loginMainImg;
-    },
-    loginNameUrl() {
-      return this.loginNameImg ? this.loginNameImg : this.loginName;
-    },
-    loginTitleUrl() {
-      return this.loginTitleImg ? this.loginTitleImg : this.loginTitle;
-    },
-    loginLogoUrl() {
-      return this.loginLogoImg ? this.loginLogoImg : this.loginLogo;
-    },
     warnInfo() {
       return this.warning === false
         ? false
@@ -736,11 +720,11 @@ export default {
   data() {
     return {
       align: this.position,
-      loginBackgroundImg: null,
-      loginMainImg: null,
-      loginNameImg: null,
-      loginTitleImg: null,
-      loginLogoImg: null,
+      loginBackgroundImg: this.loginBackground,
+      loginMainImg: this.loginImage,
+      loginNameImg: this.loginName,
+      loginTitleImg: this.loginTitle,
+      loginLogoImg: this.loginLogo,
       loginModel: this.type,
       passModifyModel: null,
       active: 0,
@@ -844,21 +828,36 @@ export default {
           }
         });
     },
-    getImgUrl(urls) {
-      let url = '';
-      if (!urls || !urls.length) {
-        return url;
+    getBackground(res) {
+      let style = {};
+      if (!res || (Array.isArray(res) && !res.length)) {
+        return style;
       }
-      if (Array.isArray(urls)) {
-        url = urls
-          .map((item) => {
-            return `url(${item})`;
-          })
-          .join(',');
+      if (Array.isArray(res)) {
+        let url = [];
+        let image = [];
+        res.forEach((item) => {
+          if (item.indexOf('url(') > -1) {
+            url.push(item);
+          } else {
+            image.push(`url(${item})`);
+          }
+        });
+        if (url.length == res.length) {
+          style = { background: url.join(',') };
+        } else if (image.length == res.length) {
+          style = { 'background-image': image.join(',') };
+        } else {
+          console.error('设置的样式不一致！');
+        }
+      } else if (util.isObject(res)) {
+        style = res;
+      } else if (res.indexOf('url(') > -1) {
+        style = { background: res };
       } else {
-        url = `url(${urls})`;
+        style = { 'background-image': `url(${res})` };
       }
-      return url;
+      return style;
     },
     getRemember(user) {
       let values = localStorage.getItem('unpd');
@@ -1023,10 +1022,12 @@ export default {
       if (res.loginModel) {
         this.loginModel = res.loginModel;
       }
-      this.loginBackgroundImg = res.loginBackgroundUrl
-        ? res.loginBackgroundUrl.split(',')
-        : null;
-      this.loginLogoImg = res.loginLogoUrl ? res.loginLogoUrl : null;
+      if (res.loginBackgroundUrl) {
+        this.loginBackgroundImg = res.loginBackgroundUrl.split(',');
+      }
+      if (res.loginLogoUrl) {
+        this.loginLogoImg = res.loginLogoUrl;
+      }
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         this.icpInfo = res.subsystemExtend;