eoss-ui 0.5.33 → 0.5.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.33",
+  "version": "0.5.35",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -96,7 +96,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.82",
+    "eoss-element": "^0.2.83",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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

@@ -162,7 +162,6 @@ export default {
         return this.value === undefined ? [] : this.value;
       },
       set(val) {
-        console.log(val);
         return val;
       }
     },

package/packages/dialog/src/main.vue

@@ -6,7 +6,7 @@
     :width="wd"
     :height="ht"
     :close-on-click-modal="shadeClose"
-    :showScale="!full"
+    :showScale="showScale"
     :drag="drag"
     :modal-append-to-body="modalAppendToBody"
     v-bind="$attrs"
@@ -337,7 +337,11 @@ export default {
       type: Boolean,
       default: true
     },
-    closeParent: Boolean
+    closeParent: Boolean,
+    showScale: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     wujieName() {

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

@@ -12,26 +12,33 @@
           <el-tab-pane
             v-if="handleHide(items.hide)"
             :key="indexs"
-            :immediate="items.label == '流程图' ? false : items.immediate"
-            :label="items.label"
+            :immediate="items.immediate"
             :name="String(indexs)"
             :class="{ 'es-flex-vertical': items.average }"
           >
-            <span slot="label" v-if="items.title">
-              <template v-if="typeof items.title === 'object'">
-                <i v-if="items.title.icon" :class="items.title.icon"></i>
-                <el-badge
-                  v-if="
-                    Object.prototype.hasOwnProperty.call(items.title, 'count')
-                  "
-                  type="primary"
-                  :value="items.title.count"
-                  :max="99"
-                >
-                </el-badge>
-                {{ items.title.text }}
+            <span
+              slot="label"
+              :style="{
+                color:
+                  activeName == String(indexs) ? items.activeColor : items.color
+              }"
+            >
+              <template v-if="items.title">
+                <template v-if="typeof items.title === 'object'">
+                  <i v-if="items.title.icon" :class="items.title.icon"></i>
+                  <el-badge
+                    v-if="items.title.count"
+                    type="primary"
+                    :value="items.title.count"
+                    :color="items.title.color"
+                    :max="99"
+                  >
+                  </el-badge>
+                  <template v-if>{{ items.title.text }}</template>
+                </template>
+                <template v-else>{{ items.title }}</template>
               </template>
-              <template v-else>{{ items.title }}</template>
+              <template>{{ items.label }}</template>
             </span>
             <es-tabs-panel v-bind="items" :show="activeName === String(indexs)">
               <template
@@ -483,7 +490,8 @@ export default {
       businessId: undefined,
       taskExamineAppId: this.appId,
       showMsg: true,
-      formRefs: this.refs
+      formRefs: this.refs,
+      submits: null
     };
   },
   computed: {
@@ -544,7 +552,15 @@ export default {
         attrs: attrs
       });
     },
-    handleUrlJoinParams(res) {
+    handleUrlJoinParams(res, flag = true) {
+      if (flag) {
+        if (res.method) {
+          this.submit = {
+            id: res.id,
+            method: typeof res.method === 'boolean' ? 'submit' : res.method
+          };
+        }
+      }
       let url = res.url;
       let param = util.extend(
         {},
@@ -585,6 +601,12 @@ export default {
       });
     },
     handleSubmit(res) {
+      if (this.submit) {
+        if (this.submit.id) {
+          let iframe = document.getElementById(this.submit.id); //先找到ifram
+          return iframe.contentWindow[this.submit.method](res); //用dom对象调用子页面的方法
+        }
+      }
       let esFlowForm = this.formRefs
         ? this.$refs[this.formRefs]
         : this.$refs.esFlowForm;

package/packages/handler/src/main.vue

@@ -31,38 +31,47 @@
         v-else-if="item.type === 'system'"
         placement="bottom"
         trigger="hover"
-        popper-class="es-popper-sub-system"
+        ref="system"
+        :popper-class="
+          system.length > 4
+            ? 'es-popper-sub-system is-width'
+            : 'es-popper-sub-system'
+        "
+        @show="showPopper = true"
+        @hide="showPopper = false"
       >
-        <ul class="es-sub-system">
-          <li
-            v-for="ele in system"
-            class="es-sub-system-item"
-            :class="{
-              'es-disabled':
-                (application && !ele.hasPermission) ||
-                (ele.extendData && ele.extendData.businessStatus == 0)
-            }"
-            :key="ele.id"
-            :title="ele.text"
-            @click.stop="handleSelect({ node: ele })"
-          >
-            <el-badge
-              :is-dot="typeof ele.tips === 'boolean'"
-              :hidden="!ele.tips"
-              :max="99"
-              :value="typeof ele.tips !== 'boolean' ? ele.tips : 0"
-              ><i
-                :class="[
-                  unicode(ele.icons) ? ele.icons : 'es-icons',
-                  'es-sub-system-icon',
-                  { 'es-icon-yingyong': !ele.icons }
-                ]"
-                v-html="unicode(ele.icons) ? '' : ele.icons"
-              ></i
-            ></el-badge>
-            <div class="es-sub-system-title">{{ ele.text }}</div>
-          </li>
-        </ul>
+        <el-scrollbar max-height="320px" v-if="system.length">
+          <ul class="es-sub-system">
+            <li
+              v-for="ele in system"
+              class="es-sub-system-item"
+              :class="{
+                'es-disabled':
+                  (application && !ele.hasPermission) ||
+                  (ele.extendData && ele.extendData.businessStatus == 0)
+              }"
+              :key="ele.id"
+              :title="ele.text"
+              @click.stop="handleSelect({ node: ele })"
+            >
+              <el-badge
+                :is-dot="typeof ele.tips === 'boolean'"
+                :hidden="!ele.tips"
+                :max="99"
+                :value="typeof ele.tips !== 'boolean' ? ele.tips : 0"
+                ><i
+                  :class="[
+                    unicode(ele.icons) ? ele.icons : 'es-icons',
+                    'es-sub-system-icon',
+                    { 'es-icon-yingyong': !ele.icons }
+                  ]"
+                  v-html="unicode(ele.icons) ? '' : ele.icons"
+                ></i
+              ></el-badge>
+              <div class="es-sub-system-title">{{ ele.text }}</div>
+            </li>
+          </ul>
+        </el-scrollbar>
         <div
           slot="reference"
           class="es-handler-icon"
@@ -139,6 +148,16 @@ export default {
       default: false
     }
   },
+  watch: {
+    subSystem: {
+      handler(val) {
+        if (this.showPopper) {
+          this.$refs.system[0].doClose();
+          this.$nextTick(this.$refs.system[0].doShow);
+        }
+      }
+    }
+  },
   computed: {
     lists() {
       if (this.data === undefined) {
@@ -208,7 +227,8 @@ export default {
           icon: 'es-icon-xitongguanli',
           title: '设置'
         }
-      ]
+      ],
+      showPopper: false
     };
   },
   created() {

package/packages/login/src/main.vue

@@ -291,12 +291,12 @@
       <span class="es-login-icp-item" :style="_copyrightStyle">{{
         icpInfo.copyright_unit
       }}</span>
-      <a
+      <span
         class="es-login-icp-item"
         target="_blank"
         :style="_copyrightStyle"
         :href="icpInfo.copyright_icp_url"
-        >{{ icpInfo.copyright_icp }}</a
+        >{{ icpInfo.copyright_icp }}</span
       >
     </div>
     <es-dialog
@@ -314,8 +314,8 @@
           :username="formData.username"
           :operationCheckCode="operationCheckCode"
           @success="handleSuccess"
-        ></reset-password
-      ></slot>
+        ></reset-password>
+      </slot>
     </es-dialog>
     <es-dialog
       title="客户端下载"
@@ -323,9 +323,20 @@
       height="80%"
       custom-class="es-clients-dialog"
       :visible.sync="showDownLoadApp"
-      ><es-clients v-bind="download"></es-clients>
+    >
+      <es-clients v-bind="download"></es-clients>
     </es-dialog>
     <slot name="calogin"></slot>
+    <es-dialog
+      title="请进行身份效验"
+      width="420px"
+      height="380px"
+      :show-scale="false"
+      :visible.sync="showAssistance"
+      @close="closeAssistance"
+    >
+      <es-qr-code :content="checkCode" v-if="checkCode"></es-qr-code>
+    </es-dialog>
   </div>
 </template>
 <script>
@@ -343,7 +354,8 @@ import {
   getTwoFactorLoginCode,
   doTwoFactorLogin,
   doWechatQrLogin,
-  doCaLogin
+  doCaLogin,
+  doAssistanceQrLogin
 } from 'eoss-ui/src/config/api.js';
 export default {
   name: 'EsLogin',
@@ -743,7 +755,10 @@ export default {
       code: null,
       defaultModel: JSON.parse(JSON.stringify(this.model)),
       copyrightColor: null,
-      copyrightBgColor: null
+      copyrightBgColor: null,
+      checkCode: '',
+      showAssistance: false,
+      doAssistance: null
     };
   },
   created() {
@@ -763,6 +778,7 @@ export default {
     } else {
       this.getLogin();
       document.addEventListener('keyup', this.doLogin);
+      document.addEventListener('keydown', this.forbiddenTab);
     }
   },
   mounted() {
@@ -1286,7 +1302,6 @@ export default {
     loginInfo(res) {
       clearTimeout(this.interval);
       if (res) {
-        //this.modifyPasswordfun();
         this.interval = setTimeout(() => {
           this.initRequestLoginInfo();
         }, this.scanIntervalTime);
@@ -1304,7 +1319,12 @@ export default {
         .then((res) => {
           if (res.rCode === 0) {
             const results = res.results;
-            this.handleResults(results, 3);
+            if (results.statusCode === 0) {
+              clearTimeout(this.interval);
+              this.handleResults(results, 3);
+            } else {
+              this.loginInfo(true);
+            }
           }
         })
         .catch((err) => {
@@ -1315,7 +1335,6 @@ export default {
         });
     },
     handleResults(results, type) {
-      this.loginInfo(false);
       switch (results.statusCode) {
         case 0:
           util.setStorage({
@@ -1409,6 +1428,12 @@ export default {
             })
             .catch((e) => {});
           break;
+        case 102:
+          this.checkCode = results.checkCode;
+          this.showAssistance = true;
+          let { operationCheckCode } = JSON.parse(results.checkCode);
+          this.handleAssistance({ operationCheckCode });
+          break;
         default:
           if (type !== 3) {
             this.$message({
@@ -1431,12 +1456,55 @@ export default {
           }
       }
     },
+    handleAssistance(data) {
+      clearTimeout(this.doAssistance);
+      this.doAssistance = setTimeout(() => {
+        this.doAssistanceLogin(data);
+      }, this.scanIntervalTime);
+    },
+    doAssistanceLogin(data) {
+      util
+        .ajax({
+          method: 'post',
+          url: doAssistanceQrLogin,
+          data: data
+        })
+        .then((res) => {
+          if (res.rCode === 0) {
+            const results = res.results;
+            if (results.statusCode === 0) {
+              clearTimeout(this.doAssistance);
+              this.handleResults(results, 3);
+            } else {
+              this.handleAssistance(data);
+            }
+          } else {
+            clearTimeout(this.doAssistance);
+            this.$message.error(res.msg);
+          }
+        })
+        .catch((err) => {
+          clearTimeout(this.doAssistance);
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
+    closeAssistance() {
+      clearTimeout(this.doAssistance);
+    },
     handleSuccess() {
       this.showResetPassword = false;
+    },
+    forbiddenTab(e) {
+      if (e.keyCode == 9) {
+        return false;
+      }
     }
   },
   beforeDestroy() {
     document.removeEventListener('keyup', this.doLogin);
+    document.removeEventListener('keydown', this.forbiddenTab);
   }
 };
 </script>

package/packages/login/src/resetPassword.vue

@@ -395,7 +395,7 @@ export default {
               this.checkPassword = new RegExp(results.checkPassword);
             }
             if (results.checkPasswordMsg) {
-              this.checkPasswordMsg = new RegExp(results.checkPasswordMsg);
+              this.checkPasswordMsg = results.checkPasswordMsg;
             }
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
@@ -476,10 +476,12 @@ export default {
           data: data.password,
           key: this.secret
         });
-        data.oldPassword = util.esmEncrypt({
-          data: data.oldPassword,
-          key: this.secret
-        });
+        if (data.oldPassword) {
+          data.oldPassword = util.esmEncrypt({
+            data: data.oldPassword,
+            key: this.secret
+          });
+        }
       }
       if (this.activeIndex == '0') {
         data.operationCheckCode = this.operationCheckCode;

package/packages/main/src/main.vue

@@ -479,16 +479,10 @@ export default {
           )
         );
       }
-      console.log(topRightToolHide);
-      console.log(
-        'Object.keys(topRightToolHide).length',
-        Object.keys(topRightToolHide).length
-      );
       if (this.layout === 'subsystem' || this.application) {
         if (this.hides && Object.keys(this.hides).length) {
           return { ...this.hides, set: !this.set, system: false };
         } else if (topRightToolHide && Object.keys(topRightToolHide).length) {
-          console.log('topRightToolHide', topRightToolHide);
           return { ...topRightToolHide, set: !this.set, system: false };
         } else {
           return { set: !this.set, system: false };
@@ -934,6 +928,9 @@ export default {
           sessionStorage.setItem('sysLogoIco', results[i]);
           util.setFavicon(results[i]);
         }
+        if (i === 'subsystemExtend' && results[i].themeColor) {
+          this.color = unescape(results[i].themeColor).toLowerCase();
+        }
         if (i === 'userStyle' && results[i].color) {
           this.color = unescape(results[i].color).toLowerCase();
         }
@@ -978,26 +975,14 @@ export default {
         }
         return true;
       }
-      util
-        .ajax({ url: this.mainConfig })
-        .then((res) => {
-          if (res && res.rCode === 0) {
-            this.setConfig(res.results, 1);
-            if (this.remote) {
-              this.getMenu();
-            } else {
-              this.renderMenu();
-            }
-          } else {
-            let msg = res.msg || '系统错误，请联系管理员！';
-            this.$message.error(msg);
-          }
-        })
-        .catch((err) => {
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
-          }
-        });
+      util.getMainConfig((res) => {
+        this.setConfig(res, 1);
+        if (this.remote) {
+          this.getMenu();
+        } else {
+          this.renderMenu();
+        }
+      });
     },
     reGetConfig() {
       util

package/packages/main/src/userinfo.vue

@@ -267,7 +267,7 @@ export default {
               this.checkPassword = new RegExp(results.checkPassword);
             }
             if (results.checkPasswordMsg) {
-              this.checkPasswordMsg = new RegExp(results.checkPasswordMsg);
+              this.checkPasswordMsg = results.checkPasswordMsg;
             }
             this.results = results.simpleUserInfo;
             this.values.orgName = results.simpleUserInfo.orgName;

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

@@ -1 +1 @@
-@charset "UTF-8";.es-handler{padding:5px 16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-handler .es-handler-item{position:relative}.es-handler .es-handler-item+.es-handler-item{margin-left:12px}.es-handler .es-handler-item .el-badge__content.is-fixed{top:4px;right:14px}.es-handler .es-handler-item:first-child .es-handler-date,.es-handler .es-handler-item:first-child .es-handler-user{padding-right:12px}.es-handler .es-handler-item:first-child .es-handler-date::after,.es-handler .es-handler-item:first-child .es-handler-user::after{content:'';height:100%;display:block;position:absolute;top:0;right:0;border-right:1px solid #d9d9d9}.es-handler .es-handler-icon{font-size:24px;cursor:pointer;padding:4px;border-radius:4px}.es-handler .es-handler-icon:hover{background-color:#69c0ff}.es-handler .es-handler-date{font-size:14px;padding-right:8px}.es-handler .es-handler-date .es-online-num{font-weight:700;padding:0 7px;cursor:pointer;color:#ffea00}.es-handler .es-handler-user{height:48px}.es-handler .es-handler-user .es-user-img{width:48px;height:48px;float:left}.es-handler .es-handler-user .es-user-info{margin-left:60px}.es-handler .es-handler-user .es-user-job{max-width:140px}.es-popper-sub-system{background-color:#1890ff!important;color:#ffff;max-width:346px;min-width:unset}.es-popper-sub-system .popper__arrow::after{border-bottom-color:#096dd9!important}.es-sub-system{margin:0}.es-sub-system::after{content:'';display:block;clear:both}.es-sub-system .es-sub-system-item{width:80px;height:80px;padding:10px 4px;float:left;text-align:center;cursor:pointer}.es-sub-system .es-sub-system-item .es-sub-system-icon{font-size:32px;display:block;clear:both;margin-bottom:8px}.es-sub-system .es-sub-system-item .es-sub-system-title{width:100%;height:17px;font-size:13px;line-height:17px;display:block;overflow:hidden}.es-sub-system .es-sub-system-item:hover{background-color:#69c0ff;color:#fff}.es-sub-system .es-sub-system-item.es-disabled{cursor:not-allowed;color:rgba(255,255,255,.3);background-color:transparent}.el-dropdown-menu__item.es-job-active{background-color:#69c0ff;color:#fff}.es-color-picker{padding-left:24px}.es-color-picker .el-color-picker-tip{font-size:12px;color:#f21f06;margin-top:8px}
+@charset "UTF-8";.es-handler{padding:5px 16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-handler .es-handler-item{position:relative}.es-handler .es-handler-item+.es-handler-item{margin-left:12px}.es-handler .es-handler-item .el-badge__content.is-fixed{top:4px;right:14px}.es-handler .es-handler-item:first-child .es-handler-date,.es-handler .es-handler-item:first-child .es-handler-user{padding-right:12px}.es-handler .es-handler-item:first-child .es-handler-date::after,.es-handler .es-handler-item:first-child .es-handler-user::after{content:'';height:100%;display:block;position:absolute;top:0;right:0;border-right:1px solid #d9d9d9}.es-handler .es-handler-icon{font-size:24px;cursor:pointer;padding:4px;border-radius:4px}.es-handler .es-handler-icon:hover{background-color:#69c0ff}.es-handler .es-handler-date{font-size:14px;padding-right:8px}.es-handler .es-handler-date .es-online-num{font-weight:700;padding:0 7px;cursor:pointer;color:#ffea00}.es-handler .es-handler-user{height:48px}.es-handler .es-handler-user .es-user-img{width:48px;height:48px;float:left}.es-handler .es-handler-user .es-user-info{margin-left:60px}.es-handler .es-handler-user .es-user-job{max-width:140px}.es-popper-sub-system{background-color:#1890ff!important;color:#ffff;min-width:unset}.es-popper-sub-system.is-width{width:346px}.es-popper-sub-system .popper__arrow::after{border-bottom-color:#096dd9!important}.es-sub-system{margin:0}.es-sub-system::after{content:'';display:block;clear:both}.es-sub-system .es-sub-system-item{width:80px;height:80px;padding:10px 4px;float:left;text-align:center;cursor:pointer}.es-sub-system .es-sub-system-item .es-sub-system-icon{font-size:32px;display:block;clear:both;margin-bottom:8px}.es-sub-system .es-sub-system-item .es-sub-system-title{width:100%;height:17px;font-size:13px;line-height:17px;display:block;overflow:hidden}.es-sub-system .es-sub-system-item:hover{background-color:#69c0ff;color:#fff}.es-sub-system .es-sub-system-item.es-disabled{cursor:not-allowed;color:rgba(255,255,255,.3);background-color:transparent}.el-dropdown-menu__item.es-job-active{background-color:#69c0ff;color:#fff}.es-color-picker{padding-left:24px}.es-color-picker .el-color-picker-tip{font-size:12px;color:#f21f06;margin-top:8px}