eoss-ui 0.6.38 → 0.6.40

package/packages/flow/src/selectUser.vue

@@ -78,6 +78,7 @@
         @cancel="cancelSelectUser"
         @change="getSelectUser"
         :param="newParams"
+        :disableds="disableds"
         ><i class="es-icon-user"></i
       ></es-selector>
       <!-- :action="url" -->
@@ -103,6 +104,10 @@ export default {
     nextUser: {
       default: () => []
     },
+    disableds:{
+      type:Array,
+      default: () => []
+    },
     radioList: {
       type: Array,
       default: () => []

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

@@ -281,6 +281,8 @@
                       <component
                         v-if="item.component || item.type == 'component'"
                         :is="item.is || item.type"
+                        show
+                        isShow
                         v-bind="
                           handleExclAttribute({
                             data: item,
@@ -295,6 +297,8 @@
                   <component
                     v-if="contents.component || contents.type == 'component'"
                     :is="contents.is || contents.type"
+                    show
+                    isShow
                     v-bind="
                       handleExclAttribute({
                         data: contents,

package/packages/form/src/main.vue

@@ -220,7 +220,7 @@
                         "
                         :prop="item.name"
                         :rules="getRules(item)"
-                        :style="style(item)"
+                        :style="getStyle(item)"
                         :class="[
                           {
                             'es-form-space-none': !space,
@@ -1268,7 +1268,7 @@
                   "
                   :prop="item.name"
                   :rules="getRules(item)"
-                  :style="style(item)"
+                  :style="getStyle(item)"
                   :class="[
                     {
                       'es-form-space-none': !space,
@@ -2931,7 +2931,7 @@ export default {
           });
       }
     },
-    style(item, res) {
+    getStyle(item, res) {
       const { col, row } = item;
       if (this.inline) {
         if (Object.prototype.hasOwnProperty.call(item, 'width')) {

package/packages/login/src/main.vue

@@ -833,9 +833,7 @@ export default {
     showForget() {
       return this.forgetUrl && typeof this.forgetUrl === 'string'
         ? true
-        : this.forgetUrl === true &&
-            (this.loginModel.indexOf('11') > -1 ||
-              this.loginModel.indexOf('6') > -1);
+        : this.forgetUrl === true && this.loginModel.indexOf('0') > -1;
     }
   },
   watch: {
@@ -1266,9 +1264,6 @@ export default {
         document.title = res.subsystemName;
       }
       this.app = res.appName || res.subsystemName;
-      if (res.qrimg || res.qrImg) {
-        this.qrimg = res.qrimg || res.qrImg;
-      }
       if (res.loginModel && ceshi !== 'true' && ceshi !== true) {
         this.loginModel =
           (res.firstLoginModel || this.firstLoginModel) && !isLogined
@@ -1284,6 +1279,9 @@ export default {
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         this.icpInfo = res.subsystemExtend;
+        if (res.subsystemExtend.qrimg || res.subsystemExtend.qrImg) {
+          this.qrimg = res.subsystemExtend.qrimg || res.subsystemExtend.qrImg;
+        }
         //忘记密码地址
         if (
           res.subsystemExtend.forgetPassUrl ||

package/packages/selector/src/main.vue

@@ -357,7 +357,7 @@ export default {
       visible: false,
       menuVisibleOnFocus: false,
       inputHovering: false,
-      style: {},
+      styles: {},
       words: '',
       minWidth: '',
       options: '',

package/packages/selector-panel/src/main.vue

@@ -3,7 +3,7 @@
     v-model="activeName"
     class="es-selector-panel"
     mold="border-card"
-    :style="style"
+    :style="styles"
     @tab-click="handleClick"
   >
     <el-tab-pane
@@ -222,7 +222,7 @@ export default {
   },
   data() {
     return {
-      style: { width: this.width, height: this.height },
+      styles: { width: this.width, height: this.height },
       loading: true,
       search: '',
       defaults: '',
@@ -518,6 +518,7 @@ export default {
         if (this.replace) {
           return this.tabs;
         } else {
+          console.log(util.extend(true, tabs, this.tabs), 'this.tabs');
           return util.extend(true, tabs, this.tabs);
         }
       }

package/packages/sizer/src/main.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="es-sizer"
-    :style="style"
+    :style="styles"
     v-loading="loading"
     element-loading-text="处理中..."
     element-loading-spinner="el-icon-loading"
@@ -96,7 +96,7 @@ export default {
     }
   },
   computed: {
-    style() {
+    styles() {
       if (this.esDialog) {
         return { height: '100%' };
       }
@@ -189,7 +189,7 @@ export default {
         if (this.checkType === 'checkAllTrue') {
           ids = ['all'];
         } else {
-          this.checkeds.forEach(item => {
+          this.checkeds.forEach((item) => {
             let data = JSON.parse(item.data.objdata);
             if (data.creditCode && data.creditCode !== 'undefined') {
               creditCodes.push(data.creditCode);
@@ -216,7 +216,7 @@ export default {
               data: params,
               params: params
             })
-            .then(res => {
+            .then((res) => {
               this.loading = false;
               if (res.rCode === 0) {
                 creditCodes = creditCodes.concat(res.results.split(','));
@@ -227,7 +227,7 @@ export default {
                 });
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading = false;
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);

package/packages/tabs/src/main.vue

@@ -7,7 +7,7 @@
     ref="elTab"
     :before-leave="handleBefore"
     :class="{ 'es-tabs-full': isFull }"
-    :style="style"
+    :style="styles"
   >
     <slot>
       <template v-for="(items, indexs) in tabs">
@@ -695,7 +695,7 @@ export default {
     isFull() {
       return this.full !== undefined ? this.full : this.fill;
     },
-    style() {
+    styles() {
       return {
         height: this.height ? this.height : this.full || this.fill ? '100%' : ''
       };

package/packages/theme-chalk/lib/flow.css

@@ -1 +1 @@
-@charset "UTF-8";.commonOpinion-set,.es-flow-index{-webkit-box-orient:vertical;-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-user-defined{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.required .el-textarea__inner::-webkit-input-placeholder{color:red}.required .el-textarea__inner::-moz-placeholder{color:red}.required .el-textarea__inner:-ms-input-placeholder{color:red}.required .el-textarea__inner::-ms-input-placeholder{color:red}.required .el-textarea__inner::placeholder{color:red}.no-checked .el-checkbox__input{display:none!important}.es-flow-index{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-bottom:12px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative}.es-flow-index .em-flow-more-btn{display:block;width:100%}.es-flow-index .el-checkbox-group{display:contents}.es-flow-index .es-eidt-title{font-size:13px;color:#333;line-height:20px}.es-flow-index .es-flow-top{height:380px}.es-flow-index .es-flow-top .es-flow-title{height:40px;line-height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{position:absolute;right:8px;top:4px}.es-flow-index .es-flow-top .es-opinion{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.es-flow-index .es-flow-top .es-opinion .es-opinion-file{cursor:pointer;position:relative}.es-flow-index .es-flow-top .es-opinion .es-opinion-file .es-file-num{color:red}.es-flow-index .es-button-agree{width:calc(43% - 15px)}.es-flow-index .es-button-agree-save{margin-top:10px}.commonOpinion-set{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%}.commonOpinion-set .el-table__body-wrapper{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-flow-index-shrink{width:24px}.es-flow-index-shrink img{cursor:pointer;width:24px;height:24px}.es-flow-btn:hover{background-color:#f5f5f5;color:#1890ff}.es-flow-btn:hover ::v-deep .el-popover{padding:12px 0!important}.es-flow-form .el-checkbox-group{display:contents}.es-flow-index .el-input-group--prepend>.el-input__inner,.es-flow-index .select-process>.el-input__inner{display:none!important}.es-flow-form .el-textarea:first-child,.es-flow-index .el-textarea{width:100%;margin-bottom:10px!important}.es-flow-form .es-opinions .el-select,.es-flow-index .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-select .el-input{width:100%;height:40px}.es-flow-index .process .el-select{width:calc(100% + 40px)!important}.es-flow-index .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-index .select-process .el-input-group__append{height:40px}.es-flow-index .hide-flow-char .el-input-group__append{padding:0}.es-flow-index button.el-button.sub.el-button--primary.el-button--medium{width:calc(100% - 85px)}.es-flow-index .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-index .demo-dynamic .el-select{width:100%!important}.es-flow-index .demo-dynamic .select-process .el-select,.es-flow-index .demo-dynamic .selectUser,.es-flow-index.task-union-examine .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-input.el-input-group.el-input-group--append.el-input-group--prepend{margin:0!important}.es-flow-index .demo-dynamic,.es-flow-index .es-footer-btn{margin-top:10px}.es-flow-index .es-footer-btn .el-button+.el-button{margin:10px 10px 0 0}.es-flow-index .el-input.is-disabled .el-input__inner{color:#606266}.es-flow-index .es-flow-btn{margin-right:10px}.es-flow-index .es-info{padding:0 8px;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.es-flow-index .es-info::-webkit-scrollbar{width:5px}.es-flow-index .news{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:10px 0}.es-flow-index .news .sj,.show{width:10px;height:10px;border-right:1px solid #000;border-bottom:1px solid #000;margin-right:10px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg);-webkit-transition:.5s;transition:.5s}.es-flow-index .news .show{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.es-flow-index .el-checkbox{margin:0 10px 10px 0}.es-flow-index .info::-webkit-scrollbar-track{-webkit-box-shadow:inset006pxrgba(0,0,0,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.1);-webkit-box-shadow:inset006pxrgba(0,0,0,.5)}.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{right:5px!important}.es-flow-form .input-with-select{width:100%;margin-top:0}.es-flow-form .el-select{width:100%}.es-flow-form .es-opinions .el-select{width:calc(100% + 40px)!important}.select-users .el-input-group__append .el-button span,.select-users .no-icon .el-input-group__append{display:none}.select-users .el-input-group__append{background-color:#1890ff}.select-users .el-input-group__append .el-button i{font-size:18px;color:#fff}.es-flow-form .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-form .el-input-group--prepend>.el-input__inner{display:none!important}.es-flow-form button.el-button.sub.el-button--danger.el-button--medium{width:calc(100% - 85px)}.es-flow-form .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-form .el-form-item__label{font-weight:700}.es-flow-form .el-input.is-disabled .el-input__inner{color:#000}.select-user{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.select-user .left{width:30%}.select-user .right{padding:3px;width:69%}.select-user .el-checkbox{width:170px;margin-top:11px;margin-bottom:11px}.select-user .all{margin:0!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{background-color:#1890ff!important;border-color:#1890ff!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{border-color:#fff}.es-flow-index .el-checkbox__input.is-disabled+span.el-checkbox__label,.flow-dialog .el-checkbox__input.is-disabled+span.el-checkbox__label{color:rgba(0,0,0,.85)}
+@charset "UTF-8";.commonOpinion-set,.es-flow-index{-webkit-box-orient:vertical;-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-user-defined{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.required .el-textarea__inner::-webkit-input-placeholder{color:red}.required .el-textarea__inner::-moz-placeholder{color:red}.required .el-textarea__inner:-ms-input-placeholder{color:red}.required .el-textarea__inner::-ms-input-placeholder{color:red}.required .el-textarea__inner::placeholder{color:red}.no-checked .el-checkbox__input{display:none!important}.es-flow-index{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-bottom:12px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative}.es-flow-index .em-flow-more-btn{display:block;width:100%}.es-flow-index .el-checkbox-group{display:contents}.es-flow-index .es-eidt-title{font-size:13px;color:#333;line-height:20px}.es-flow-index .es-flow-top{height:380px}.es-flow-index .es-flow-top .es-flow-title{height:40px;line-height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{position:absolute;right:8px;top:4px}.es-flow-index .es-flow-top .es-opinion{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.es-flow-index .es-flow-top .es-opinion .es-opinion-file{cursor:pointer;position:relative}.es-flow-index .es-flow-top .es-opinion .es-opinion-file .es-file-num{color:red}.es-flow-index .es-button-agree{width:calc(43% - 15px)}.es-flow-index .es-button-agree-save{margin-top:10px}.commonOpinion-set{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%}.commonOpinion-set .el-table__body-wrapper{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-flow-index-shrink{width:24px}.es-flow-index-shrink img{cursor:pointer;width:24px;height:24px}.es-flow-btn:hover{background-color:#f5f5f5;color:#1890ff}.es-flow-btn:hover ::v-deep .el-popover{padding:12px 0!important}.es-flow-form .el-checkbox-group{display:contents}.es-flow-index .el-input-group--prepend>.el-input__inner,.es-flow-index .select-process>.el-input__inner{display:none!important}.es-flow-form .el-textarea:first-child,.es-flow-index .el-textarea{width:100%;margin-bottom:10px!important}.es-flow-form .es-opinions .el-select,.es-flow-index .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-select .el-input{width:100%;height:40px}.es-flow-index .process .el-select{width:calc(100% + 40px)!important}.es-flow-index .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-index .select-process .el-input-group__append{height:40px}.es-flow-index .hide-flow-char .el-input-group__append{padding:0}.es-flow-index button.el-button.sub.el-button--primary.el-button--medium{width:calc(100% - 85px)}.es-flow-index .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-index .demo-dynamic .el-select{width:100%!important}.es-flow-index .demo-dynamic .select-process .el-select,.es-flow-index .demo-dynamic .selectUser,.es-flow-index.task-union-examine .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-input.el-input-group.el-input-group--append.el-input-group--prepend{margin:0!important}.es-flow-index .demo-dynamic{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;margin-top:10px}.es-flow-index .es-footer-btn{margin-top:10px}.es-flow-index .es-footer-btn .el-button+.el-button{margin:10px 10px 0 0}.es-flow-index .el-input.is-disabled .el-input__inner{color:#606266}.es-flow-index .es-flow-btn{margin-right:10px}.es-flow-index .es-info{padding:0 8px;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.es-flow-index .es-info::-webkit-scrollbar{width:5px}.es-flow-index .news{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:10px 0}.es-flow-index .news .sj,.show{width:10px;height:10px;border-right:1px solid #000;border-bottom:1px solid #000;margin-right:10px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg);-webkit-transition:.5s;transition:.5s}.es-flow-index .news .show{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.es-flow-index .el-checkbox{margin:0 10px 10px 0}.es-flow-index .info::-webkit-scrollbar-track{-webkit-box-shadow:inset006pxrgba(0,0,0,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.1);-webkit-box-shadow:inset006pxrgba(0,0,0,.5)}.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{right:5px!important}.es-flow-form .input-with-select{width:100%;margin-top:0}.es-flow-form .el-select{width:100%}.es-flow-form .es-opinions .el-select{width:calc(100% + 40px)!important}.select-users .el-input-group__append .el-button span,.select-users .no-icon .el-input-group__append{display:none}.select-users .el-input-group__append{background-color:#1890ff}.select-users .el-input-group__append .el-button i{font-size:18px;color:#fff}.es-flow-form .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-form .el-input-group--prepend>.el-input__inner{display:none!important}.es-flow-form button.el-button.sub.el-button--danger.el-button--medium{width:calc(100% - 85px)}.es-flow-form .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-form .el-form-item__label{font-weight:700}.es-flow-form .el-input.is-disabled .el-input__inner{color:#000}.select-user{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.select-user .left{width:30%}.select-user .right{padding:3px;width:69%}.select-user .el-checkbox{width:170px;margin-top:11px;margin-bottom:11px}.select-user .all{margin:0!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{background-color:#1890ff!important;border-color:#1890ff!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{border-color:#fff}.es-flow-index .el-checkbox__input.is-disabled+span.el-checkbox__label,.flow-dialog .el-checkbox__input.is-disabled+span.el-checkbox__label{color:rgba(0,0,0,.85)}