eoss-ui 0.5.67 → 0.5.68

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

@@ -1,11 +1,12 @@
 <template>
   <div
+    v-if="isRender"
     class="es-selector"
     ref="esSelector"
     :class="{ 'es-pointer': !readonly && !filterable }"
     v-clickoutside="handleClose"
   >
-    <el-button v-if="button" v-bind="button" @click.stop="openDialog"
+    <el-button v-if="button" v-bind="button" @click="openDialog"
       ><slot>选择</slot></el-button
     >
     <template v-else>
@@ -105,7 +106,6 @@
               readonly
               :name="name"
               type="text"
-              wqwq
               v-show="false"
             ></el-input>
           </template>
@@ -188,6 +188,7 @@
       class="es-selector-dialog"
     >
       <es-selector-panel
+        v-if="isReset"
         v-model="selected"
         v-bind="$attrs"
         :multiple="multiple"
@@ -329,6 +330,13 @@ export default {
     emptySerach: {
       type: Boolean,
       default: false
+    },
+    reset: Boolean,
+    useCaseCode: String,
+    businessData: [String, Array, Object],
+    inputHeight: {
+      type: Number,
+      default: 40
     }
   },
   data() {
@@ -348,6 +356,16 @@ export default {
     };
   },
   computed: {
+    isRender() {
+      let useCaseCodes = util.getStorage('useCaseCodes');
+      if (useCaseCodes && this.useCaseCode) {
+        return useCaseCodes.indexOf(this.useCaseCode) > -1;
+      }
+      return true;
+    },
+    isReset() {
+      return this.reset ? this.visible : true;
+    },
     _elFormItemSize() {
       return (this.elFormItem || {}).elFormItemSize;
     },
@@ -413,7 +431,11 @@ export default {
     selected: {
       deep: true,
       handler(val) {
-        this.$emit('change', Array.isArray(val) ? val : [val]);
+        this.$emit(
+          'change',
+          Array.isArray(val) ? val : [val],
+          this.businessData
+        );
         if (this.multiple) {
           this.resetInputHeight();
         }
@@ -551,10 +573,11 @@ export default {
       this.visible = false;
       if (util.isObject(res)) {
         this.$emit('input', [res]);
+        this.$emit('confirm', [res], this.businessData);
       } else {
         this.$emit('input', res);
+        this.$emit('confirm', res, this.businessData);
       }
-      this.$emit('confirm', res);
       let inputChildNodes = this.$refs.reference
         ? this.$refs.reference.$el.childNodes
         : null;
@@ -565,6 +588,9 @@ export default {
         input.focus();
         input.blur();
       }
+      if (this.reset) {
+        this.selected = [];
+      }
     },
     handleClear() {
       this.$emit('input', []);
@@ -584,7 +610,7 @@ export default {
       if (this.collapseTags) return;
       this.$nextTick(() => {
         if (!this.$refs.reference) return;
-        const sizeInMap = this.initialInputHeight || 40;
+        const sizeInMap = this.inputHeight;
         let height = '';
         if (this.selected !== undefined && this.selected.length === 0) {
           height = sizeInMap + 'px';

package/packages/theme-chalk/lib/button-group.css

@@ -1 +1 @@
-@charset "UTF-8";.el-button-group>.es-selector,.el-button-group>.es-upload{float:left}.el-button-group>.es-selector:first-child>.el-button,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button{border-top-right-radius:0;border-bottom-right-radius:0}.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button{border-radius:0}.el-button-group>.es-selector:last-child>.el-button,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button{border-top-left-radius:0;border-bottom-left-radius:0}.el-button-group>.es-selector:not(:last-child)>.el-button,.el-button-group>.es-upload:not(:last-child)>.el-upload--handle>.el-upload>.el-button{margin-right:-1px}.es-button-group{display:-webkit-box;display:-ms-flexbox;display:flex}.es-button-group>.el-dropdown>.el-button{border-color:#d9d9d9}.el-button-group>.el-button+.es-button,.el-button-group>.es-button+.el-button,.el-button-group>.es-button+.es-button{margin-left:0}.el-button-group>.es-selector:first-child>.el-button.el-button--danger,.el-button-group>.es-selector:first-child>.el-button.el-button--info,.el-button-group>.es-selector:first-child>.el-button.el-button--primary,.el-button-group>.es-selector:first-child>.el-button.el-button--success,.el-button-group>.es-selector:first-child>.el-button.el-button--warning{border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--danger,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--info,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--primary,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--success,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5);border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-selector:last-child>.el-button.el-button--danger,.el-button-group>.es-selector:last-child>.el-button.el-button--info,.el-button-group>.es-selector:last-child>.el-button.el-button--primary,.el-button-group>.es-selector:last-child>.el-button.el-button--success,.el-button-group>.es-selector:last-child>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5);border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5)}
+@charset "UTF-8";.el-button-group>.es-selector,.el-button-group>.es-upload{float:left}.el-button-group>.es-selector:first-child>.el-button,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button{border-top-right-radius:0;border-bottom-right-radius:0}.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button{border-radius:0}.el-button-group>.es-selector:last-child>.el-button,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button{border-top-left-radius:0;border-bottom-left-radius:0}.el-button-group>.es-selector:not(:last-child)>.el-button,.el-button-group>.es-upload:not(:last-child)>.el-upload--handle>.el-upload>.el-button{margin-right:-1px}.es-button-group{display:-webkit-box;display:-ms-flexbox;display:flex}.es-button-group>.el-dropdown>.el-button{border-color:#d9d9d9}.el-button-group>.el-button+.es-button,.el-button-group>.es-button+.el-button,.el-button-group>.es-button+.es-button{margin-left:0}.el-button-group>.es-selector:first-child>.el-button.el-button--danger,.el-button-group>.es-selector:first-child>.el-button.el-button--info,.el-button-group>.es-selector:first-child>.el-button.el-button--primary,.el-button-group>.es-selector:first-child>.el-button.el-button--success,.el-button-group>.es-selector:first-child>.el-button.el-button--warning{border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--danger,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--info,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--primary,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--success,.el-button-group>.es-selector:not(:first-child):not(:last-child)>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5);border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-selector:last-child>.el-button.el-button--danger,.el-button-group>.es-selector:last-child>.el-button.el-button--info,.el-button-group>.es-selector:last-child>.el-button.el-button--primary,.el-button-group>.es-selector:last-child>.el-button.el-button--success,.el-button-group>.es-selector:last-child>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:first-child>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:not(:first-child):not(:last-child)>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5);border-right-color:rgba(255,255,255,.5)}.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--danger,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--info,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--primary,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--success,.el-button-group>.es-upload:last-child>.el-upload--handle>.el-upload>.el-button.el-button--warning{border-left-color:rgba(255,255,255,.5)}.es-dropdown-padding{padding:0}.es-dropdown-selector>.el-button,.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button{display:block;width:100%;text-align:left;padding:6px 20px;line-height:24px;font-size:14px;border:0}.es-dropdown-upload>.el-upload--handle,.es-dropdown-upload>.el-upload--handle>.el-upload{display:block}.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button{color:rgba(0,0,0,.75)}.es-dropdown-upload>.el-upload--handle>.el-upload>.el-button:hover{color:#69c0ff}.es-dropdown-selector>.el-button{color:rgba(0,0,0,.75)}.es-dropdown-selector>.el-button:hover{color:#69c0ff}