eoss-ui 0.5.66 → 0.5.68

package/lib/eoss-ui.common.js

@@ -43845,8 +43845,8 @@ flow_group_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var flow_group = (flow_group_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=6484db16&
-var mainvue_type_template_id_6484db16_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=74518680&
+var mainvue_type_template_id_74518680_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -44042,11 +44042,11 @@ var mainvue_type_template_id_6484db16_render = function () {
     2
   )
 }
-var mainvue_type_template_id_6484db16_staticRenderFns = []
-mainvue_type_template_id_6484db16_render._withStripped = true
+var mainvue_type_template_id_74518680_staticRenderFns = []
+mainvue_type_template_id_74518680_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=6484db16&
+// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=74518680&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=script&lang=js&
 var flow_list_src_mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -44926,6 +44926,11 @@ var flow_list_src_mainvue_type_script_lang_js_components;
           _this6.isShort = isShort;
           _this6.taskReadName = taskReadName;
           _this6.flowData = wfHistoryList;
+          _this6.flowData.map(function (x) {
+            if (!x.deptid) {
+              x.deptid = x.deptName;
+            }
+          });
           _this6.splitReadingData = fyHistoryList;
           _this6.modify = modify;
           _this6.show = true;
@@ -45086,8 +45091,8 @@ var flow_list_src_mainvue_type_script_lang_js_components;
 
 var flow_list_src_main_component = normalizeComponent(
   packages_flow_list_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6484db16_render,
-  mainvue_type_template_id_6484db16_staticRenderFns,
+  mainvue_type_template_id_74518680_render,
+  mainvue_type_template_id_74518680_staticRenderFns,
   false,
   null,
   null,
@@ -47377,8 +47382,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var layout = (layout_src_main);
-// 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&
-var mainvue_type_template_id_b795be2e_render = function () {
+// 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 mainvue_type_template_id_c5d4acd0_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47387,15 +47392,13 @@ var mainvue_type_template_id_b795be2e_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"),
@@ -47421,26 +47424,24 @@ var mainvue_type_template_id_b795be2e_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(),
@@ -47497,7 +47498,7 @@ var mainvue_type_template_id_b795be2e_render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                !_vm.loginTitleUrl
+                                !_vm.loginTitleImg
                                   ? _c(
                                       "div",
                                       { staticClass: "es-login-title" },
@@ -47808,7 +47809,7 @@ var mainvue_type_template_id_b795be2e_render = function () {
                               "div",
                               { staticClass: "es-login-qrcode" },
                               [
-                                !_vm.loginTitleUrl
+                                !_vm.loginTitleImg
                                   ? _c(
                                       "div",
                                       { staticClass: "es-login-title" },
@@ -47935,7 +47936,7 @@ var mainvue_type_template_id_b795be2e_render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                !_vm.loginTitleUrl
+                                !_vm.loginTitleImg
                                   ? _c(
                                       "div",
                                       { staticClass: "es-login-title" },
@@ -48297,11 +48298,11 @@ var mainvue_type_template_id_b795be2e_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_b795be2e_staticRenderFns = []
-mainvue_type_template_id_b795be2e_render._withStripped = true
+var mainvue_type_template_id_c5d4acd0_staticRenderFns = []
+mainvue_type_template_id_c5d4acd0_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 () {
@@ -49201,13 +49202,6 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
 
 
 
@@ -49240,8 +49234,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         return {};
       }
     },
-    loginBackground: [String, Array],
-    loginImage: [String, Array],
+    loginBackground: [String, Array, Object],
+    loginImage: [String, Array, Object],
     loginLogo: String,
     loginTitle: String,
     loginName: String,
@@ -49444,21 +49438,6 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         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 : '本系统为非涉密系统，禁止上传和处理任何涉密文件';
     },
@@ -49567,11 +49546,11 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
   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,
@@ -49665,19 +49644,36 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         }
       });
     },
-    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 (utils_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');
@@ -49841,8 +49837,12 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       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;
@@ -50325,8 +50325,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_b795be2e_render,
-  mainvue_type_template_id_b795be2e_staticRenderFns,
+  mainvue_type_template_id_c5d4acd0_render,
+  mainvue_type_template_id_c5d4acd0_staticRenderFns,
   false,
   null,
   null,
@@ -74490,7 +74490,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.66',
+  version: '0.5.68',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-list.js

@@ -3800,8 +3800,8 @@ module.exports = require("qs");
 // 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/flow-list/src/main.vue?vue&type=template&id=6484db16&
-var mainvue_type_template_id_6484db16_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-list/src/main.vue?vue&type=template&id=74518680&
+var mainvue_type_template_id_74518680_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3998,10 +3998,10 @@ var mainvue_type_template_id_6484db16_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_6484db16_render._withStripped = true
+mainvue_type_template_id_74518680_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=6484db16&
+// CONCATENATED MODULE: ./packages/flow-list/src/main.vue?vue&type=template&id=74518680&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4890,6 +4890,11 @@ var _components;
           _this6.isShort = isShort;
           _this6.taskReadName = taskReadName;
           _this6.flowData = wfHistoryList;
+          _this6.flowData.map(function (x) {
+            if (!x.deptid) {
+              x.deptid = x.deptName;
+            }
+          });
           _this6.splitReadingData = fyHistoryList;
           _this6.modify = modify;
           _this6.show = true;
@@ -5053,7 +5058,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6484db16_render,
+  mainvue_type_template_id_74518680_render,
   staticRenderFns,
   false,
   null,