eoss-mobiles 0.2.13 → 0.2.15

package/lib/utils/axios.js

@@ -19,169 +19,157 @@ var _qs2 = _interopRequireDefault(_qs);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var apiUrl = _util2.default.getStorage('host');
-// import Vue from 'vue';
 
-var http = _axios2.default.create({
-  baseURL: apiUrl,
-  timeout: 60000,
-  headers: {
-    // clientKey: 'csjk'
-  },
-  withCredentials: false
-});
-http.interceptors.request.use(function (config) {
-  var data = {};
-  if (config.method === 'post') {
-    // 特殊处理在线考试接口1
-    if (config.url.search('HGtest') !== -1) {
-      config.headers['Content-Type'] = 'application/json;';
-      // config.data = qs.stringify(data);
-      Object.assign(data, config.data);
-    } else if (config.url.search('/outsidedirector/business/update') !== -1) {
-      delete config.data.userId;
-    } else if (config.url.indexOf('decisionSuperviseMeet') !== -1) {
-      config.headers['Content-Type'] = 'application/x-www-form-urlencoded';
-      Object.assign(data, config.data);
-      config.data = _qs2.default.stringify(data);
+var ajax = function ajax(url) {
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var type = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'get';
+
+  var http = _axios2.default.create({
+    baseURL: apiUrl,
+    timeout: 60000,
+    headers: {
+      // clientKey: 'csjk'
+    },
+    withCredentials: false
+  });
+  http.interceptors.request.use(function (config) {
+    if (type === 'post' && format) {
+      config.data = _qs2.default.stringify(params);
+      if (!config.headers['content-type'] && !headers['Content-Type']) {
+        config.headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+      }
     } else {
-      config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-      if (Object.prototype.toString.call(config.data).slice(8, -1).toLowerCase() !== 'formdata') {
-        Object.assign(data, config.data);
-        config.data = _qs2.default.stringify(data);
+      if (!config.headers['content-type'] && !headers['Content-Type']) {
+        config.headers['content-type'] = 'application/json;charset=UTF-8';
       }
+      config.data = params;
     }
-  } else {
-    Object.assign(config.params, data);
-    config.headers['Content-Type'] = 'application/json;';
-  }
-  if (_util2.default.getStorage('token')) {
-    config.headers.Authorization = _util2.default.getStorage('token');
-  }
-  if (_util2.default.getStorage('deviceId')) {
-    config.headers.deviceId = _util2.default.getStorage('deviceId');
-  }
 
-  var a = '/config/';
+    if (_util2.default.getStorage('token')) {
+      config.headers.Authorization = _util2.default.getStorage('token');
+    }
+    if (_util2.default.getStorage('deviceId')) {
+      config.headers.deviceId = _util2.default.getStorage('deviceId');
+    }
 
-  if (config.url.search(a) !== -1 && config.url.search('appInfo') === -1) {
-    config.headers.clientKey = _util2.default.getStorage('clientKey') || 'csjk2';
-  }
-  if (config.url.search('api/financePhone/') !== -1) {
-    config.baseURL = 'https://release.cdgzjg.cn/';
-  }
-  if (config.url.search('affairs/getHandleInfosnew.json') !== -1) {
-    config.headers = {
-      token: sessionStorage.getItem('token'),
-      oueside_token: sessionStorage.getItem('token'),
-      deviceId: '432a320f99793e39',
-      Authorization: sessionStorage.getItem('token')
-    };
-  }
-  if (config.url.search('/getmyAccount.json') !== -1) {
-    delete config.params.userId;
-  }
-  if (config.url.search('/sso2/authCenter') !== -1) {
-    delete config.headers.clientKey;
-    delete config.headers.deviceId;
-  }
-  if (config.url.search('/appInfo') !== -1) {
-    config.headers.deviceId = _util2.default.getStorage('deviceId');
-    delete config.headers.clientKey;
-  }
-  if (config.url.search('getPresetCustomInfo') !== -1 || config.url.search('registerNew') !== -1) {
-    // config.baseURL = "/api";
-    config.headers.token = _util2.default.getStorage('token');
-  }
-  if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
-    delete config.headers.deviceId;
-  }
-  // if(config.url.search('getVehicleMaintenanceInfoForAPP') !== -1 ) {
-  //   delete config.headers.deviceId
-  //   delete config.headers.Authorization
-  //   delete config.headers.clientKey
-  // }
-  if (config.url.search('/bpm') !== -1) {
-    // config.baseURL = "/api";
-    // config.headers.Authorization = $.getStorage('token');
-    // config.headers.Deviceunique = $.getStorage('deviceunique');
-    // config.headers.Ssid = $.getStorage('ssid');
-    // delete config.headers.deviceId;
-    // delete config.headers.clientKey;
-  }
-  return config;
-}, function (error) {
-  return Promise.error(error);
-});
-// 响应拦截器
-http.interceptors.response.use(function (response) {
-  if (response.status === 200) {
-    if (response.data.rCode === 64 || response.data.rCode === 27) {
-      _util2.default.H5TokenInvalid();
-    } else {
-      return Promise.resolve(response.data);
+    var a = '/config/';
+
+    if (config.url.search(a) !== -1 && config.url.search('appInfo') === -1) {
+      config.headers.clientKey = _util2.default.getStorage('clientKey') || 'csjk2';
     }
-  } else {
-    return Promise.reject(response);
-  }
-}, function (error) {
-  if (error && error.response) {
-    if (error.response.status) {
-      switch (error.response.status) {
-        case 400:
-          error.message = '错误请求';
-          break;
-        case 401:
-          error.message = '未授权，请重新登录';
-          break;
-        case 403:
-          error.message = '登录过期，请重新登录';
-          _util2.default.removeStorage('userId');
-          break;
-        case 404:
-          error.message = '网络请求不存在';
-          break;
-        case 405:
-          error.message = '请求方法错误';
-          break;
-        case 408:
-          error.message = '请求超时';
-          break;
-        case 500:
-          error.message = '服务器端出错';
-          break;
-        case 501:
-          error.message = '网络未实现';
-          break;
-        case 502:
-          error.message = '网络错误';
-          break;
-        case 503:
-          error.message = '服务不可用';
-          break;
-        case 504:
-          error.message = '网络超时';
-          break;
-        case 505:
-          error.message = 'http版本不支持该请求';
-          break;
-        default:
-          error.message = '\u8FDE\u63A5\u9519\u8BEF' + error.response.status;
+    if (config.url.search('api/financePhone/') !== -1) {
+      config.baseURL = 'https://release.cdgzjg.cn/';
+    }
+    if (config.url.search('affairs/getHandleInfosnew.json') !== -1) {
+      config.headers = {
+        token: sessionStorage.getItem('token'),
+        oueside_token: sessionStorage.getItem('token'),
+        deviceId: '432a320f99793e39',
+        Authorization: sessionStorage.getItem('token')
+      };
+    }
+    if (config.url.search('/getmyAccount.json') !== -1) {
+      delete config.params.userId;
+    }
+    if (config.url.search('/sso2/authCenter') !== -1) {
+      delete config.headers.clientKey;
+      delete config.headers.deviceId;
+    }
+    if (config.url.search('/appInfo') !== -1) {
+      config.headers.deviceId = _util2.default.getStorage('deviceId');
+      delete config.headers.clientKey;
+    }
+    if (config.url.search('getPresetCustomInfo') !== -1 || config.url.search('registerNew') !== -1) {
+      config.headers.token = _util2.default.getStorage('token');
+    }
+    if (config.url.search('mecp/overtime') !== -1 || config.url.search('mecp/leave') !== -1 || config.url.search('contractext') !== -1 || config.url.search('getSysParam') !== -1) {
+      delete config.headers.deviceId;
+    }
+    return config;
+  }, function (error) {
+    return Promise.error(error);
+  });
+  http.interceptors.response.use(function (response) {
+    if (response.status === 200) {
+      if (response.data.rCode === 64 || response.data.rCode === 27) {
+        _util2.default.H5TokenInvalid();
+      } else {
+        return Promise.resolve(response.data);
       }
     } else {
-      error.message = '接口出现问题，无法请求';
+      return Promise.reject(response.data);
     }
-  }
-  (0, _eossMobileVant.Toast)({
-    message: error.message,
-    duration: 1500,
-    forbidClick: true
+  }, function (error) {
+    if (error && error.response) {
+      if (error.response.status) {
+        switch (error.response.status) {
+          case 400:
+            error.message = '错误请求';
+            break;
+          case 401:
+            error.message = '未授权，请重新登录';
+            break;
+          case 403:
+            error.message = '登录过期，请重新登录';
+            _util2.default.removeStorage('userId');
+            break;
+          case 404:
+            error.message = '网络请求不存在';
+            break;
+          case 405:
+            error.message = '请求方法错误';
+            break;
+          case 408:
+            error.message = '请求超时';
+            break;
+          case 500:
+            error.message = '服务器端出错';
+            break;
+          case 501:
+            error.message = '网络未实现';
+            break;
+          case 502:
+            error.message = '网络错误';
+            break;
+          case 503:
+            error.message = '服务不可用';
+            break;
+          case 504:
+            error.message = '网络超时';
+            break;
+          case 505:
+            error.message = 'http版本不支持该请求';
+            break;
+          default:
+            error.message = '\u8FDE\u63A5\u9519\u8BEF' + error.response.status;
+        }
+      } else {
+        error.message = '接口出现问题，无法请求';
+      }
+    }
+    (0, _eossMobileVant.Toast)({
+      message: error.message,
+      duration: 1500,
+      forbidClick: true
+    });
+    return Promise.reject(error);
   });
-  return Promise.reject(error);
-});
+  if (type === 'get' || type === 'GET') {
+    return http.get(url, params, headers, format);
+  } else {
+    return http.post(url, params, headers, format);
+  }
+};
+
+// 响应拦截器
 
 var base = {
   get: function get(url) {
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var format = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
     if (params.params && url.search('registerNew') === -1) {
       params.params.userId = params.params.userId ? params.params.userId : _util2.default.getStorage('userId');
@@ -198,19 +186,17 @@ var base = {
         params.userId = 'u1b9f3ce4731649e0b665af015d74c19b';
       }
     }
-    return http.get(url, {
+    return ajax(url, {
       params: params
-    });
+    }, headers, format);
   },
-  post: function post(url) {
-    var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
+  post: function post(url, params, headers, format) {
     if (params.params) {
       params.params.userId = params.params.userId || _util2.default.getStorage('userId');
     } else {
       params.userId = params.userId || _util2.default.getStorage('userId');
     }
-    return http.post(url, params);
+    return ajax(url, params, headers, format, 'post');
   }
 };
 exports.default = base;

package/lib/utils/http.js

@@ -12,19 +12,19 @@ var request = function request(options) {
   var fn = void 0;
   switch (options.type) {
     case 'post':
-      fn = _axios2.default.post(options.url, options.params);
+      fn = _axios2.default.post(options.url, options.params, options.headers, options.format);
       break;
     case 'POST':
-      fn = _axios2.default.post(options.url, options.params);
+      fn = _axios2.default.post(options.url, options.params, options.headers, options.format);
       break;
     case 'get':
-      fn = _axios2.default.get(options.url, options.params);
+      fn = _axios2.default.get(options.url, options.params, options.headers = {});
       break;
     case 'GET':
-      fn = _axios2.default.get(options.url, options.params);
+      fn = _axios2.default.get(options.url, options.params, options.headers = {});
       break;
     default:
-      fn = _axios2.default.get(options.url, options.params);
+      fn = _axios2.default.get(options.url, options.params, options.headers = {});
   }
   return fn;
 };

package/lib/utils/util.js

@@ -8,8 +8,43 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 
 var _color = require('@eoss-design/color');
 
+// import CryptoJS from 'crypto-js'
 var sm2 = require('sm-crypto').sm2;
-
+// /**
+//  * esEncrypt
+//  * @desc:sm2加密
+//  * @author huangbo
+//  * @date 2022年5月7日
+//  * @param {string} [data] - 被加密的字符串
+//  * @param {string} [key] - 公钥
+//  **/
+// const encryptDes = (message, key) => {
+//   const keyHex = CryptoJS.enc.Utf8.parse(key);
+//   const encrypted = CryptoJS.DES.encrypt(message, keyHex, {
+//    mode: CryptoJS.mode.ECB,
+//    padding: CryptoJS.pad.Pkcs7
+//    });
+//   return encrypted.toString();
+// }
+// /**
+//  * esEncrypt
+//  * @desc:sm2加密
+//  * @author huangbo
+//  * @date 2022年5月7日
+//  * @param {string} [data] - 被加密的字符串
+//  * @param {string} [key] - 公钥
+//  **/
+// const decryptDes = (ciphertext, key) => {
+//   const keyHex = CryptoJS.enc.Utf8.parse(key);
+//   // direct decrypt ciphertext
+//   const decrypted = CryptoJS.DES.decrypt({
+//      ciphertext: CryptoJS.enc.Base64.parse(ciphertext)
+//    }, keyHex, {
+//      mode: CryptoJS.mode.ECB,
+//      padding: CryptoJS.pad.Pkcs7
+//   });
+//   return decrypted.toString(CryptoJS.enc.Utf8);
+// }
 /**
  * esEncrypt
  * @desc:sm2加密
@@ -1211,6 +1246,23 @@ var openAttachment = function openAttachment(data) {
     }
   }
 };
+/**
+ * jsGoPayrollIndexAct
+ * @desc:原生app打开工资条页面
+ * @date 2024年1月11日
+ * @author liufan
+ */
+var jsGoPayrollIndexAct = function jsGoPayrollIndexAct(id) {
+  var u = navigator.userAgent;
+  var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; // android终端
+  var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); // ios终端
+  if (isAndroid) {
+    window.AndroidWebView.jsGoPayrollIndexAct(id);
+  } else if (isiOS) {
+    window.webkit.messageHandlers.jsGoPayrollIndexAct.postMessage(id);
+  }
+};
+
 /**
  * deepClone
  * @desc:深拷贝
@@ -1268,6 +1320,21 @@ var exclAttribute = function exclAttribute(_ref4) {
   }
   return obj;
 };
+/**
+ * 获取UUID
+ * @desc:generateUUID
+ * @author liufan
+ * @date 2024年1月12日
+ **/
+var generateUUID = function generateUUID() {
+  var d = new Date().getTime();
+  var uuid = 'xxxxxxxxxxxxxxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    var r = (d + Math.random() * 16) % 16 | 0;
+    d = Math.floor(d / 16);
+    return (c === 'x' ? r : r & 0x3 | 0x8).toString(16);
+  });
+  return uuid;
+};
 exports.default = {
   esEncrypt: esEncrypt,
   esDecode: esDecode,
@@ -1311,5 +1378,7 @@ exports.default = {
   getTypeName: getTypeName,
   replenish: replenish,
   identical: identical,
-  exportXls: exportXls
+  jsGoPayrollIndexAct: jsGoPayrollIndexAct,
+  exportXls: exportXls,
+  generateUUID: generateUUID
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/date/src/main.vue

@@ -327,7 +327,7 @@ export default {
           h +
           (this.joinStr ? ' ' : '时');
       } else if (type === 'year' && newValue != 'Invalid Date') {
-        value = y + (this.joinStr || '年');
+        value = y + (this.joinStr? '' : '年');
       }
       return value;
     },

package/packages/flow/src/components/Handle.vue

@@ -21,6 +21,8 @@
           :isOpinionRequired="isOpinionRequired"
           :disabled="isBanInputOpinion != 0"
           :baseUrl="baseUrl"
+          :isForceDisplayDefaultOptionForPrefix="isForceDisplayDefaultOptionForPrefix"
+          :nodeDefaultSubmitOpinion="nodeDefaultSubmitOpinion"
           :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
           :isHiddenOftenOpinion="isHiddenOftenOpinion == 1 ? false : true"
         ></Opinion>
@@ -295,7 +297,6 @@
                 v-model="nextReadUserSelectList"
                 multiple
                 :objType="objType"
-                required
                 :param="{
                   pid: pid
                 }"
@@ -479,6 +480,7 @@ export default {
       objType: 'enterprise', //树点击对象
       selectType: 'employee', // 树 选择类型
       isNextBox: true, // 是否展开隐藏下步操作
+      isForceDisplayDefaultOptionForPrefix:false,
       isOtherUnit: true, //是否是外单位
       isShowNode: false,
       subProcessInfo: '',
@@ -1281,6 +1283,7 @@ export default {
               // that.isChooseNextNode = nodeInfoMap.nodeExtAttr.isChooseNextNode;
               that.isBanInputOpinion =
                 nodeInfoMap.nodeExtAttr.isBanInputOpinion;
+              that.isForceDisplayDefaultOptionForPrefix = nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix == 1;
             }
             that.choiceOrgId = choiceOrgId;
             that.choiceDeptId = choiceDeptId;

package/packages/flow/src/components/Opinion.vue

@@ -32,7 +32,7 @@
               />
               <span
                 class="em-flow-opion"
-                v-if="opinionList.length > 0 && isHiddenOftenOpinion"
+                v-if="isHiddenOftenOpinion"
                 @click="showPicker = true"
                 >常用意见 <i class="iconfont icon-em-more"
               /></span>
@@ -88,7 +88,7 @@
         :columns="opinionList"
         valueKey="content"
         @cancel="handleClose"
-        @confirm="onInput"
+        @confirm="onInput($event, true)"
       >
       </van-picker>
     </van-popup>
@@ -139,6 +139,14 @@ export default {
     userId: {
       type: String,
       default: ''
+    },
+    isForceDisplayDefaultOptionForPrefix: {
+      type: Boolean,
+      default: false
+    },
+    nodeDefaultSubmitOpinion: {
+      type: String,
+      default: ''
     }
   },
   // components: {
@@ -147,6 +155,7 @@ export default {
   data() {
     return {
       opinion: '',
+      newOpinion: '',
       fixedDisabled: false,
       showPicker: false,
       esignPath: '',
@@ -159,6 +168,17 @@ export default {
       opinionList: [] //意见列表
     };
   },
+  watch: {
+    isForceDisplayDefaultOptionForPrefix: {
+      handler(val) {
+        if (val) {
+          this.opinion = this.nodeDefaultSubmitOpinion;
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
   created() {
     if (this.nodeFixedOpinionSelectList.length > 0) {
       this.opinionList = this.nodeFixedOpinionSelectList;
@@ -202,9 +222,25 @@ export default {
       });
     },
     // 将input的值传递到父组件
-    onInput(val) {
+    onInput(val, isSelect) {
       const { isImageOpinion, file } = this;
       this.opinion = typeof val === 'string' ? val : val.content;
+      if (
+        this.isForceDisplayDefaultOptionForPrefix &&
+        !this.opinion.startsWith(this.nodeDefaultSubmitOpinion) &&
+        !isSelect
+      ) {
+        this.opinion = this.nodeDefaultSubmitOpinion + this.newOpinion;
+      } else if (this.isForceDisplayDefaultOptionForPrefix && !isSelect) {
+        this.newOpinion = this.opinion.replace(
+          this.nodeDefaultSubmitOpinion,
+          ''
+        );
+      }
+      if (this.isForceDisplayDefaultOptionForPrefix && isSelect) {
+        this.newOpinion = this.opinion;
+        this.opinion = this.nodeDefaultSubmitOpinion + this.opinion;
+      }
       this.$emit('onInputOpintion', {
         opinion: this.opinion,
         isImageOpinion,

package/packages/flow/src/components/StartFlow.vue

@@ -22,9 +22,9 @@
       <div class="input-box">
         <!-- 下一步所有相关操作-->
         <div>
-          <div @click="isNextBox = !isNextBox" class="shrink-btn">
+          <!-- <div @click="isNextBox = !isNextBox" class="shrink-btn">
             {{ isNextBox ? '收起下一步操作和节点' : '展开下一步操作和节点' }}
-          </div>
+          </div> -->
           <div class="next-box" v-show="isNextBox">
             <!-- 下一步操作 -->
             <div class="item">
@@ -164,7 +164,7 @@ export default {
       isChooseNextNode: 0,
       isOpinionRequired: 0, //办理意见是否必填
       isBanInputOpinion: 0, //是否禁用意见
-      isNextBox: false, // 是否展开隐藏下步操作
+      isNextBox: true, // 是否展开隐藏下步操作
       defaultNotificationType: [], //选中消息数组
       // showAppUser: false, // 办理人遮罩层
       showNextList: false, // 下一步遮罩层

package/packages/flow/src/main.vue

@@ -61,6 +61,12 @@ export default {
   },
   data() {
     return {};
+  },
+  mounted(){
+    for(let i=0;i<10;i++){
+      if(i == 2) return
+      console.log(i)
+    }
   }
 };
 </script>

package/packages/retrial-auth/index.js

@@ -0,0 +1,5 @@
+import EmRetrialAuth from './src/main';
+
+EmRetrialAuth.install = Vue => Vue.component(EmRetrialAuth.name, EmRetrialAuth);
+
+export default EmRetrialAuth;