eoss-ui 0.5.34 → 0.5.37

package/packages/flow/src/main.vue

@@ -442,7 +442,7 @@
       >
         <el-button
           v-show="isSubmitButtonShowAgreeAndDisagree != 1"
-          v-for="item of hideBtn? btnList.slice(0,1) : btnList"
+          v-for="item of hideBtn ? btnList.slice(0, 1) : btnList"
           :key="item.name"
           :type="item.type"
           :style="btnStyle"
@@ -457,17 +457,17 @@
             (!isFlow && (rejectObj.fun || pointsReadingObj.fun || moreList))
           "
           placement="top"
-          :class="{'em-flow-more-btn':!hideBtn}"
+          :class="{ 'em-flow-more-btn': !hideBtn }"
           trigger="click"
         >
           <div v-if="!isFlow && !hideBtn" class="es-footer-btn">
             <el-button
               v-if="rejectObj.fun"
               @click="rejectBtn"
-              style="margin-right:10px"
+              style="margin-right: 10px"
               type="danger"
             >
-               {{ rejectObj.value }}
+              {{ rejectObj.value }}
             </el-button>
             <el-button
               v-if="pointsReadingObj.fun"
@@ -484,7 +484,11 @@
               {{ item.value }}
             </el-button>
           </div>
-          <el-button-group slot="reference" style="margin: 0px 10px" v-if="hideBtn">
+          <el-button-group
+            slot="reference"
+            style="margin: 0px 10px"
+            v-if="hideBtn"
+          >
             <el-button
               v-show="isSubmitButtonShowAgreeAndDisagree != 1"
               v-for="item of btnList.slice(1)"
@@ -500,7 +504,7 @@
             <el-dropdown
               v-if="
                 !isFlow &&
-                (rejectObj.fun || pointsReadingObj.fun || moreList.length > 0) 
+                (rejectObj.fun || pointsReadingObj.fun || moreList.length > 0)
               "
               trigger="click"
               placement="top"
@@ -1199,7 +1203,10 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
+          params: {
+            ccCode: 'notification_type',
+            userId: util.getStorage('userId')
+          }
         })
         .then((res) => {
           const { status, data } = res;
@@ -1305,10 +1312,21 @@ export default {
      **/
     rejectBtn() {
       if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      if (!this.value) {
-        return this.$message.warning('请填写意见');
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            if (!this.value) {
+              return this.$message.warning('请填写意见');
+            }
+            this.showReject = true;
+          })
+          .catch((e) => {});
+      } else {
+        if (!this.value) {
+          return this.$message.warning('请填写意见');
+        }
+        this.showReject = true;
       }
-      this.showReject = true;
     },
     /**
      * taskReadBtn
@@ -1318,9 +1336,19 @@ export default {
      **/
     taskReadBtn() {
       // return this.$message.warning('暂未开放！敬请期待');
-      if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      this.taskReadType = 'create';
-      this.showTaskRead = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+            this.taskReadType = 'create';
+            this.showTaskRead = true;
+          })
+          .catch((e) => {});
+      } else {
+        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+        this.taskReadType = 'create';
+        this.showTaskRead = true;
+      }
     },
     /**
      * getFind
@@ -1353,6 +1381,17 @@ export default {
      * @date 2022年5月25日
      **/
     endFlows(res) {
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.saveEndFlows(res);
+          })
+          .catch((e) => {});
+      } else {
+        this.saveEndFlows(res);
+      }
+    },
+    saveEndFlows(res) {
       this.$confirm('确认' + res.value + '?')
         .then(() => {
           let params = {
@@ -1485,6 +1524,18 @@ export default {
      * @date 2022年9月29日
      **/
     toTakeAdvice(res) {
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.saveToTakeAdvice(res);
+          })
+          .catch((e) => {});
+      } else {
+        this.saveToTakeAdvice(res);
+      }
+      // return this.$message.warning('暂未开放！敬请期待');
+    },
+    saveToTakeAdvice(res) {
       let params = {
         url: isCanStartSubFlow,
         data: {
@@ -1512,7 +1563,6 @@ export default {
             this.$message.error(err.message);
           }
         });
-      // return this.$message.warning('暂未开放！敬请期待');
     },
     /**
      * toStartDraf
@@ -1521,7 +1571,15 @@ export default {
      * @date 2022年9月29日
      **/
     toStartDraf(res) {
-      this.showTaskUnionExamine = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.showTaskUnionExamine = true;
+          })
+          .catch((e) => {});
+      } else {
+        this.showTaskUnionExamine = true;
+      }
     },
     /**
      * toSendMsg
@@ -1530,7 +1588,15 @@ export default {
      * @date 2022年9月29日
      **/
     toSendMsg(res) {
-      this.showSendMsg = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.showSendMsg = true;
+          })
+          .catch((e) => {});
+      } else {
+        this.showSendMsg = true;
+      }
     },
     /**
      * toTaskReadAndEnd
@@ -1539,9 +1605,19 @@ export default {
      * @date 2022年9月29日
      **/
     toTaskReadAndEnd(res) {
-      if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      this.taskReadType = 'taskReadAndEnd';
-      this.showTaskRead = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+            this.taskReadType = 'taskReadAndEnd';
+            this.showTaskRead = true;
+          })
+          .catch((e) => {});
+      } else {
+        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+        this.taskReadType = 'taskReadAndEnd';
+        this.showTaskRead = true;
+      }
     },
     /**
      * rejectAndEnd
@@ -1550,6 +1626,17 @@ export default {
      * @date 2022年9月29日
      **/
     rejectAndEnd(res) {
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.saveRejectAndEnd(res);
+          })
+          .catch((e) => {});
+      } else {
+        this.saveRejectAndEnd(res);
+      }
+    },
+    saveRejectAndEnd(res) {
       this.$confirm('确认' + res.value + '?')
         .then(() => {
           if (this.isOpinionRequired == 1 && (this.value == '' || !this.value))
@@ -1588,7 +1675,6 @@ export default {
         .catch(() => {
           // on cancel
         });
-      // return this.$message.warning('暂未开放！敬请期待');
     },
     /**
      * toTransfer
@@ -1597,9 +1683,17 @@ export default {
      * @date 2022年9月29日
      **/
     toTransfer(res) {
-      this.taskReadType = 'transfer';
-      this.showTaskRead = true;
-      // return this.$message.warning('暂未开放！敬请期待');
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.taskReadType = 'transfer';
+            this.showTaskRead = true;
+          })
+          .catch((e) => {});
+      } else {
+        this.taskReadType = 'transfer';
+        this.showTaskRead = true;
+      }
     },
     /**
      * getNodeInfo

package/packages/flow/src/processForm.vue

@@ -482,7 +482,10 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
+          params: {
+            ccCode: 'notification_type',
+            userId: util.getStorage('userId')
+          }
         })
         .then((res) => {
           const { status, data } = res;
@@ -520,6 +523,9 @@ export default {
     },
     // 提交表单
     subProcess(formName) {
+      this.saveProcess(formName);
+    },
+    saveProcess(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           const {

package/packages/flow/src/processReject.vue

@@ -148,7 +148,10 @@ export default {
     },
     // 提交表单
     subProcess(formName) {
-      this.$refs[formName].validate(valid => {
+      this.saveProcess(formName);
+    },
+    saveProcess(formName){
+       this.$refs[formName].validate(valid => {
         if (valid) {
           if (!this.option && this.isOpinionRequired === 1) {
             this.$message.warning('请选择输入审批意见');

package/packages/form/src/table.vue

@@ -99,7 +99,8 @@
                 class="es-table-form-label"
                 :class="{
                   'es-align-middle': item.labelRow,
-                  'is-required': required && !hideRequiredAsterisk,
+                  'is-required':
+                    item.rules && item.rules.required && !hideRequiredAsterisk,
                   'required-after': after
                 }"
                 :key="'label' + index"

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
@@ -778,6 +778,7 @@ export default {
     } else {
       this.getLogin();
       document.addEventListener('keyup', this.doLogin);
+      document.addEventListener('keydown', this.forbiddenTab);
     }
   },
   mounted() {
@@ -1494,10 +1495,16 @@ export default {
     },
     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

@@ -928,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();
         }
@@ -972,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/src/index.js

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

package/src/utils/util.js

@@ -7,7 +7,7 @@
 
 /* eslint-disable indent */
 const sm2 = require('sm-crypto').sm2;
-import { authCenter } from '../config/api';
+import { authCenter, mainConfig } from '../config/api';
 import axios from 'axios';
 import qs from 'qs';
 import JSONbig from 'json-bigint';
@@ -1206,6 +1206,7 @@ const getLength = function (text) {
  * @desc:转换明度
  * @author huangbo
  * @date 2022年5月7日
+ * @return {string,array} 元素类名或者id
  **/
 const getLightness = function ($v, $i, $isLight) {
   let $value = $isLight
@@ -1215,6 +1216,24 @@ const getLightness = function ($v, $i, $isLight) {
   return toFixed($value, 2);
 };
 
+/**
+ * getMainConfig
+ * @desc 获取系统配置
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {function} callback - 回调函数
+ **/
+const getMainConfig = function (callback) {
+  ajax({ url: mainConfig })
+    .then((res) => {
+      if (res && res.rCode === 0) {
+        callback(res.results);
+      }
+    })
+    .catch(() => {
+    });
+};
+
 /**
  * getMinute
  * @desc 获取分钟
@@ -1857,7 +1876,7 @@ const indexOfObj = function (arry, target, key) {
  * @date 2022年5月7日
  * @param {Object} [obj] -
  **/
-const isExist = function(obj) {
+const isExist = function (obj) {
   return obj !== undefined && obj !== null && obj !== '';
 };
 
@@ -2868,6 +2887,7 @@ export default {
   getHour,
   getWeekNumber,
   getLength,
+  getMainConfig,
   getMinute,
   getMonth,
   getObjectType,