eoss-ui 0.5.66 → 0.5.68

package/lib/login.js

@@ -3845,7 +3845,7 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 // 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/login/src/main.vue?vue&type=template&id=b795be2e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=c5d4acd0&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3855,15 +3855,13 @@ var render = function () {
         "div",
         {
           staticClass: "es-login-screen",
-          style: {
-            "background-image": _vm.getImgUrl(_vm.loginBackgroundUrl),
-          },
+          style: _vm.getBackground(_vm.loginBackgroundImg),
         },
         [
-          _vm.loginLogoUrl
+          _vm.loginLogoImg
             ? _c("img", {
                 staticClass: "es-login-logo",
-                attrs: { src: _vm.loginLogoUrl },
+                attrs: { src: _vm.loginLogoImg },
               })
             : _vm._e(),
           _vm._t("default"),
@@ -3889,26 +3887,24 @@ var render = function () {
               },
             },
             [
-              _vm.loginNameUrl
+              _vm.loginNameImg
                 ? _c("img", {
                     staticClass: "es-login-name",
-                    attrs: { src: _vm.loginNameUrl },
+                    attrs: { src: _vm.loginNameImg },
                   })
                 : _vm._e(),
               _c(
                 "div",
                 {
                   staticClass: "es-login-main",
-                  style: {
-                    "background-image": _vm.getImgUrl(_vm.loginImageUrl),
-                  },
+                  style: _vm.getBackground(_vm.loginMainImg),
                 },
                 [
-                  _vm.loginTitleUrl
+                  _vm.loginTitleImg
                     ? _c("div", { staticClass: "es-login-title-image" }, [
                         _c("img", {
                           staticClass: "es-login-title-img",
-                          attrs: { src: _vm.loginTitleUrl },
+                          attrs: { src: _vm.loginTitleImg },
                         }),
                       ])
                     : _vm._e(),
@@ -3965,7 +3961,7 @@ var render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                !_vm.loginTitleUrl
+                                !_vm.loginTitleImg
                                   ? _c(
                                       "div",
                                       { staticClass: "es-login-title" },
@@ -4276,7 +4272,7 @@ var render = function () {
                               "div",
                               { staticClass: "es-login-qrcode" },
                               [
-                                !_vm.loginTitleUrl
+                                !_vm.loginTitleImg
                                   ? _c(
                                       "div",
                                       { staticClass: "es-login-title" },
@@ -4403,7 +4399,7 @@ var render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                !_vm.loginTitleUrl
+                                !_vm.loginTitleImg
                                   ? _c(
                                       "div",
                                       { staticClass: "es-login-title" },
@@ -4769,7 +4765,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=b795be2e&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=c5d4acd0&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
 var resetPasswordvue_type_template_id_28f463b9_render = function () {
@@ -5684,13 +5680,6 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
 
 
 
@@ -5723,8 +5712,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         return {};
       }
     },
-    loginBackground: [String, Array],
-    loginImage: [String, Array],
+    loginBackground: [String, Array, Object],
+    loginImage: [String, Array, Object],
     loginLogo: String,
     loginTitle: String,
     loginName: String,
@@ -5927,21 +5916,6 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         return window.location.href || window.href;
       }
     },
-    loginBackgroundUrl: function loginBackgroundUrl() {
-      return this.loginBackground ? this.loginBackground : this.loginBackgroundImg;
-    },
-    loginImageUrl: function loginImageUrl() {
-      return this.loginImage ? this.loginImage : this.loginMainImg;
-    },
-    loginNameUrl: function loginNameUrl() {
-      return this.loginNameImg ? this.loginNameImg : this.loginName;
-    },
-    loginTitleUrl: function loginTitleUrl() {
-      return this.loginTitleImg ? this.loginTitleImg : this.loginTitle;
-    },
-    loginLogoUrl: function loginLogoUrl() {
-      return this.loginLogoImg ? this.loginLogoImg : this.loginLogo;
-    },
     warnInfo: function warnInfo() {
       return this.warning === false ? false : typeof this.warning === 'string' ? this.warning : '本系统为非涉密系统，禁止上传和处理任何涉密文件';
     },
@@ -6050,11 +6024,11 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
   data: function 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,
@@ -6148,19 +6122,36 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         }
       });
     },
-    getImgUrl: function getImgUrl(urls) {
-      var url = '';
-      if (!urls || !urls.length) {
-        return url;
+    getBackground: function getBackground(res) {
+      var style = {};
+      if (!res || Array.isArray(res) && !res.length) {
+        return style;
       }
-      if (Array.isArray(urls)) {
-        url = urls.map(function (item) {
-          return 'url(' + item + ')';
-        }).join(',');
+      if (Array.isArray(res)) {
+        var url = [];
+        var image = [];
+        res.forEach(function (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["a" /* default */].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: function getRemember(user) {
       var values = localStorage.getItem('unpd');
@@ -6324,8 +6315,12 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       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;

package/package.json

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

package/packages/flow-list/src/main.vue

@@ -988,6 +988,11 @@ export default {
             this.isShort = isShort;
             this.taskReadName = taskReadName;
             this.flowData = wfHistoryList;
+            this.flowData.map(x => {
+              if(!x.deptid){
+                x.deptid = x.deptName
+              }
+            })
             this.splitReadingData = fyHistoryList;
             this.modify = modify;
             this.show = true;

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,7 +43,7 @@
         <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">
+              <div class="es-login-title" v-if="!loginTitleImg">
                 <span class="es-login-title-content">{{ title }}</span>
               </div>
               <el-form-item
@@ -158,7 +151,7 @@
             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" v-if="!loginTitleImg">
                 <div class="es-login-title-content">
                   {{ iconfonts[active].name }}
                 </div>
@@ -206,7 +199,7 @@
               class="es-login-form es-login-verify"
               :model="formData"
             >
-              <div class="es-login-title" v-if="!loginTitleUrl">
+              <div class="es-login-title" v-if="!loginTitleImg">
                 <span class="es-login-title-content">{{
                   iconfonts[active].name
                 }}</span>
@@ -387,8 +380,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 +595,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 +712,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 +820,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 +1014,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;

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.66',
+  version: '0.5.68',
   install,
   Button,
   ButtonGroup,