eoss-ui 0.7.20 → 0.7.21

package/lib/wxlogin.js

@@ -199,12 +199,14 @@ var ajax = function ajax(_ref) {
       mix = _ref$mix === undefined ? false : _ref$mix,
       _ref$defaults = _ref.defaults,
       defaults = _ref$defaults === undefined ? false : _ref$defaults,
+      _ref$withCredentials = _ref.withCredentials,
+      withCredentials = _ref$withCredentials === undefined ? true : _ref$withCredentials,
       loading = _ref.loading,
       publicKey = _ref.publicKey,
       secret = _ref.secret,
       encodes = _ref.encodes,
       oldmode = _ref.oldmode,
-      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'formatConfig', 'mix', 'defaults', 'withCredentials', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -242,20 +244,18 @@ var ajax = function ajax(_ref) {
       // delPendingRequest(response.config);
       loading && loading.close();
       if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-        if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-          localStorage.setItem('token', response.headers.authorization);
-          localStorage.setItem('Authorization', response.headers.authorization);
-        } else {
-          sessionStorage.setItem('token', response.headers.authorization);
-          sessionStorage.setItem('Authorization', response.headers.authorization);
-        }
+        setStorage({
+          key: ['token', 'Authorization'],
+          value: response.headers.authorization
+        });
       }
-      if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
-        if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
-          localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
-        } else {
-          sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
-        }
+      var ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
+
+      if (ssId && ssId !== getStorage('ssId')) {
+        setStorage({
+          key: 'ssId',
+          value: ssId
+        });
       }
       if (response.status === 200) {
         responses(response.data);
@@ -1792,37 +1792,6 @@ var getSecond = function getSecond(datetime) {
   return datetimeObj.getSeconds();
 };
 
-/**
- * getStorage
- * @desc:获取本地储存数据
- * @author huangbo
- * @date 2022年5月7日
- * @param {String} [key] - 获取的名称
- **/
-var getStorage = function getStorage(key) {
-  if (key) {
-    var res = sessionStorage.getItem(key) || localStorage.getItem(key) || win[key];
-    if (key === 'host' && !res) {
-      return win.location.origin;
-    }
-    return res;
-  }
-  var defaults = {};
-  var token = sessionStorage.getItem('token') || localStorage.getItem('token') || win.token;
-  var ssId = sessionStorage.getItem('ssId') || localStorage.getItem('ssId') || win.ssId;
-  var deviceUnique = sessionStorage.getItem('deviceUnique') || localStorage.getItem('deviceUnique') || win.deviceUnique;
-  if (token) {
-    defaults.Authorization = token;
-  }
-  if (ssId) {
-    defaults.ssId = ssId;
-  }
-  if (deviceUnique) {
-    defaults.deviceUnique = deviceUnique;
-  }
-  return defaults;
-};
-
 /**
  * getStyle
  * @desc:获取元素样式（含非行内样式）
@@ -2349,9 +2318,7 @@ var isLogined = function () {
 
                 switch (results.statusCode) {
                   case 0:
-                    var storage = getStorage('storage');
                     setStorage({
-                      type: storage,
                       key: {
                         ssId: results.ssId,
                         token: results.token,
@@ -2728,28 +2695,6 @@ var receiveMessage = function receiveMessage(_ref14) {
   });
 };
 
-/**
- * removeStorage
- * @desc:删除本地储存数据
- * @author huangbo
- * @date 2022年5月7日
- * @param {String, Array} [key] - 获取的名称
- **/
-var removeStorage = function removeStorage(key) {
-  if (Array.isArray(key)) {
-    for (var i = 0; i < key.length; i++) {
-      sessionStorage.removeItem(key[i]);
-      localStorage.removeItem(key[i]);
-    }
-  } else if (key) {
-    sessionStorage.removeItem(key);
-    localStorage.removeItem(key);
-  } else {
-    sessionStorage.clear();
-    localStorage.clear();
-  }
-};
-
 /**
  * replenish
  * @desc:补全小数位数
@@ -3047,52 +2992,6 @@ var setFavicon = function setFavicon(url) {
   }
 };
 
-/**
- * setStorage
- * @desc:设置本地储存数据
- * @author huangbo
- * @date 2022年5月7日
- * @param {String} [type] - 储存类型
- * @param {String, Array, Object} [key] - 数据的名称，array类型表示多个key保存同一个value,object类型时对象的属性名称作为key属性值作为value
- * @param {String} [value] - 数据的值
- **/
-var setStorage = function setStorage(_ref17) {
-  var type = _ref17.type,
-      key = _ref17.key,
-      value = _ref17.value;
-
-  if (value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
-    value = JSON.stringify(value);
-  }
-  if (type === 'localStorage') {
-    if (typeof key === 'string') {
-      localStorage.setItem(key, value);
-    } else if (Array.isArray(key)) {
-      for (var i in key) {
-        localStorage.setItem(key[i], value);
-      }
-    } else {
-      for (var _i7 in key) {
-        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
-        localStorage.setItem(_i7, val);
-      }
-    }
-  } else {
-    if (typeof key === 'string') {
-      sessionStorage.setItem(key, value);
-    } else if (Array.isArray(key)) {
-      for (var _i8 in key) {
-        sessionStorage.setItem(key[_i8], value);
-      }
-    } else {
-      for (var _i9 in key) {
-        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
-        sessionStorage.setItem(_i9, _val);
-      }
-    }
-  }
-};
-
 /**
  * socket
  * @desc:webSocket
@@ -3353,10 +3252,10 @@ var upperCase = function upperCase(text) {
  * @param {Object} [url] - url地址
  * @param {Object} [param] - 被转换的对象
  **/
-var urlJoinParams = function urlJoinParams(_ref18) {
-  var url = _ref18.url,
-      param = _ref18.param,
-      timestamp = _ref18.timestamp;
+var urlJoinParams = function urlJoinParams(_ref17) {
+  var url = _ref17.url,
+      param = _ref17.param,
+      timestamp = _ref17.timestamp;
 
   var arry = decodeURI(url).split('?');
   var times = new Date().getTime();
@@ -3472,6 +3371,195 @@ var watermark = function watermark(option) {
   };
 };
 
+/**
+ * setStorage
+ * @desc:设置本地储存数据
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [type] - 储存类型
+ * @param {String, Array, Object} [key] - 数据的名称，array类型表示多个key保存同一个value,object类型时对象的属性名称作为key属性值作为value
+ * @param {String} [value] - 数据的值
+ **/
+var setStorage = function setStorage(_ref18) {
+  var type = _ref18.type,
+      key = _ref18.key,
+      value = _ref18.value;
+
+  type = type || getStorage('storage');
+
+  if (value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
+    value = JSON.stringify(value);
+  }
+  if (type === 'localStorage') {
+    if (typeof key === 'string') {
+      localStorage.setItem(key, value);
+      if (key === 'token') {
+        setCookie('token', value);
+      }
+    } else if (Array.isArray(key)) {
+      for (var i in key) {
+        localStorage.setItem(key[i], value);
+        if (key[i] === 'token') {
+          setCookie('token', value);
+        }
+      }
+    } else {
+      for (var _i7 in key) {
+        var val = _typeof(key[_i7]) === 'object' ? JSON.stringify(key[_i7]) : key[_i7];
+        localStorage.setItem(_i7, val);
+        if (_i7 === 'token') {
+          setCookie('token', val);
+        }
+      }
+    }
+  } else {
+    if (typeof key === 'string') {
+      sessionStorage.setItem(key, value);
+      if (key === 'token') {
+        setCookie('token', value);
+      }
+    } else if (Array.isArray(key)) {
+      for (var _i8 in key) {
+        sessionStorage.setItem(key[_i8], value);
+        if (key[_i8] === 'token') {
+          setCookie('token', value);
+        }
+      }
+    } else {
+      for (var _i9 in key) {
+        var _val = _typeof(key[_i9]) === 'object' ? JSON.stringify(key[_i9]) : key[_i9];
+        sessionStorage.setItem(_i9, _val);
+        if (_i9 === 'token') {
+          setCookie('token', _val);
+        }
+      }
+    }
+  }
+};
+
+/**
+ * getStorage
+ * @desc:获取本地储存数据
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [key] - 获取的名称
+ **/
+var getStorage = function getStorage(key) {
+  if (key) {
+    var res = sessionStorage.getItem(key) || localStorage.getItem(key) || win[key];
+    if (key === 'host' && !res) {
+      return win.location.origin;
+    }
+    return res;
+  }
+  var defaults = {};
+  var token = sessionStorage.getItem('token') || localStorage.getItem('token') || getCookie('token') || win.token;
+  var ssId = sessionStorage.getItem('ssId') || localStorage.getItem('ssId') || getCookie('ssId') || win.ssId;
+
+  var deviceUnique = sessionStorage.getItem('deviceUnique') || localStorage.getItem('deviceUnique') || getCookie('deviceUnique') || win.deviceUnique;
+  if (token) {
+    defaults.Authorization = token;
+  }
+  if (ssId) {
+    defaults.ssId = ssId;
+  }
+  if (deviceUnique) {
+    defaults.deviceUnique = deviceUnique;
+  }
+  return defaults;
+};
+
+/**
+ * removeStorage
+ * @desc:删除本地储存数据
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String, Array} [key] - 获取的名称
+ **/
+var removeStorage = function removeStorage(key) {
+  if (Array.isArray(key)) {
+    for (var i = 0; i < key.length; i++) {
+      sessionStorage.removeItem(key[i]);
+      localStorage.removeItem(key[i]);
+      if (key[i] === 'token') {
+        removeCookie('token');
+      }
+    }
+  } else if (key) {
+    sessionStorage.removeItem(key);
+    localStorage.removeItem(key);
+    if (key === 'token') {
+      removeCookie('token');
+    }
+  } else {
+    sessionStorage.clear();
+    localStorage.clear();
+    removeCookie('token');
+  }
+};
+
+/**
+ * setCookie
+ * @desc 设置cookie
+ * @author huangbo
+ * @param {string} [name] cookie名称
+ * @return {string} [value] cookie值
+ **/
+var setCookie = function setCookie(name, value) {
+  // 不设置 expires 或 max-age，默认为会话 Cookie
+  document.cookie = encodeURIComponent(name) + '=' + encodeURIComponent(value) + '; path=/';
+};
+
+/**
+ * getCookie
+ * @desc 获取cookie中指定名称的值
+ * @author huangbo
+ * @param {string} [name] cookie名称
+ **/
+var getCookie = function getCookie(name) {
+  var cookies = document.cookie.split(';');
+  for (var _iterator = cookies, _isArray = Array.isArray(_iterator), _i10 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+    var _ref19;
+
+    if (_isArray) {
+      if (_i10 >= _iterator.length) break;
+      _ref19 = _iterator[_i10++];
+    } else {
+      _i10 = _iterator.next();
+      if (_i10.done) break;
+      _ref19 = _i10.value;
+    }
+
+    var cookie = _ref19;
+
+    var _cookie$trim$split = cookie.trim().split('='),
+        cookieName = _cookie$trim$split[0],
+        cookieValue = _cookie$trim$split[1];
+
+    if (decodeURIComponent(cookieName) === name) {
+      return decodeURIComponent(cookieValue);
+    }
+  }
+  return null;
+};
+
+/**
+ * removeCookie
+ * @desc:删除cookie
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String, Array} [key] - 获取的名称
+ **/
+var removeCookie = function removeCookie(key) {
+  if (Array.isArray(key)) {
+    for (var i = 0; i < key.length; i++) {
+      document.cookie = encodeURIComponent(key[i]) + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+    }
+  } else {
+    document.cookie = encodeURIComponent(key) + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+  }
+};
+
 /* harmony default export */ __webpack_exports__["a"] = ({
   ajax: ajax,
   ajaxStream: ajaxStream,
@@ -3498,6 +3586,7 @@ var watermark = function watermark(option) {
   formatDate: formatDate,
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
+  getCookie: getCookie,
   getHour: getHour,
   getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
@@ -3535,6 +3624,7 @@ var watermark = function watermark(option) {
   mixColor: mixColor,
   overbrim: overbrim,
   queryParams: queryParams,
+  removeCookie: removeCookie,
   receiveMessage: receiveMessage,
   removeStorage: removeStorage,
   replenish: replenish,
@@ -3542,6 +3632,7 @@ var watermark = function watermark(option) {
   rgbToHsv: rgbToHsv,
   rmbToCapital: rmbToCapital,
   sendMessage: sendMessage,
+  setCookie: setCookie,
   setFavicon: setFavicon,
   setScale: setScale,
   setStorage: setStorage,

package/package.json

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

package/packages/flow/src/component/taskUnionExamine.vue

@@ -4,6 +4,7 @@
       ref="infoList"
       :model="infoList"
       class="demo-dynamic"
+      :rules="rules"
       label-width="120px"
     >
       <el-form-item v-if="isSinglePage" prop="opinion" label="意见">
@@ -67,7 +68,7 @@
       >
         <SelectUser
           :nextUser="infoList.nextOtherOrgObj"
-          :where="{ filid: 'other',roleid :selectorParams.roleid }"
+          :where="{ filid: 'other', roleid: selectorParams.roleid }"
           :multiple="newMultiple"
           @change="changeSelectUser($event, 'nextOtherOrgObj')"
           :mix="otherMix"
@@ -83,6 +84,36 @@
           :tabs="foreignOrgTabsParam"
         />
       </el-form-item>
+      <el-form-item
+        v-if="enableCustomLimitTimeSetting"
+        prop="customLimitTime"
+        label="限时办理"
+      >
+        <el-input
+          v-model="infoList.customLimitTime"
+          placeholder="请输入限时办理的天数"
+          class="input-with-select custom-limit-time"
+          >
+          <es-select
+            v-if="!showCustomLimitTimeText"
+            v-model="infoList.customLimitTime"
+            placeholder="请选择"
+            slot="prepend"
+            sysCode="bpm_custom_limit_time"
+          ></es-select>
+          <es-button
+            type="primary"
+            slot="append"
+            @click="
+              () => {
+                infoList.customLimitTime = '';
+                showCustomLimitTimeText = !showCustomLimitTimeText;
+              }
+            "
+            >切换{{ showCustomLimitTimeText ? '选择框' : '文本框' }}</es-button
+          >
+        </el-input>
+      </el-form-item>
       <!-- :rules="[
           { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]" -->
@@ -170,7 +201,12 @@ export default {
     disabled: { type: Boolean, default: false },
     simpleTips: { type: Boolean, default: true },
     multiple: { type: Boolean, default: true },
-    selectorParams: { type: Object, default: () => {return {}} }
+    selectorParams: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    }
   },
   inheritAttrs: false,
   data() {
@@ -179,14 +215,17 @@ export default {
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
       otherMix: false,
+      enableCustomLimitTimeSetting: false,
+      showCustomLimitTimeText: false,
       currentMix: false,
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
         noticeType: [],
-        noticeList:[],
+        noticeList: [],
         noticeInfo: '',
-        opinion: ''
+        opinion: '',
+        customLimitTime: ''
       },
       onlyName: '',
       unionSealData: [],
@@ -212,6 +251,20 @@ export default {
       loading: false
     };
   },
+  computed: {
+    rules() {
+      return {
+        customLimitTime: [
+          {
+            required:this.enableCustomLimitTimeSetting,
+            message: this.showCustomLimitTimeText?'请输入限时办理天数' : '请选择限时办理天数',
+            trigger: 'blur'
+          },
+          {required:this.enableCustomLimitTimeSetting, validator: this.checkCustomLimitTime, trigger: 'change' }
+        ]
+      };
+    }
+  },
   mounted() {
     this.loading = true;
     this.newMultiple = this.multiple;
@@ -222,6 +275,25 @@ export default {
     this.getInfo();
   },
   methods: {
+    validate() {
+      let validSate = true;
+      this.$refs.infoList.validate((valid) => {
+        if (valid) {
+          validSate = true;
+        } else {
+          validSate = false;
+        }
+      });
+      return validSate;
+    },
+    checkCustomLimitTime(rule, value, callback){
+      if (!Number(value) || value.indexOf('.') != -1 || Number(value) < 0) {
+        callback(new Error('请输入正确的天数'))
+        this.infoList.customLimitTime = '';
+      }else{
+        callback()
+      }
+    },
     isMultiple(val) {
       if (val == 7 || val == 9 || val == 11) {
         this.newMultiple = false;
@@ -336,6 +408,8 @@ export default {
                 unionDispatchOrgId,
                 otherOrgDisabledObjId,
                 orgNames,
+                enableCustomLimitTimeSetting,
+                defaultCustomLimitDays,
                 nodeInfoMap: {
                   nodeExtAttr: {
                     userSelectionType,
@@ -349,6 +423,10 @@ export default {
             if (otherOrgDisabledObjId) {
               this.otherOrgDisabledObjId = otherOrgDisabledObjId.split(',');
             }
+            this.enableCustomLimitTimeSetting = enableCustomLimitTimeSetting;
+            if(this.enableCustomLimitTimeSetting &&  defaultCustomLimitDays){
+              this.infoList.customLimitTime = defaultCustomLimitDays + ''
+            }
             if (res.data.customizedConfig) {
               if (res.data.customizedConfig.currentOrgSelectorCustomized) {
                 this.currentMix =
@@ -459,6 +537,7 @@ export default {
           nextCurrentOrgObj,
           nextOtherOrgObj,
           noticeType,
+          customLimitTime,
           noticeInfo
         },
         isOpinionRequired,
@@ -471,18 +550,21 @@ export default {
         isSubFlow,
         pendingId
       } = this;
+      console.log(nextCurrentOrgObj);
+      console.log(nextOtherOrgObj);
       if (
         type == 'takeAdvice' &&
         !nextCurrentOrgObj &&
         isHideCurrentOrg == 0 &&
+        nextCurrentOrgObj.length == 0 &&
         isHideOtherOrg == 0 &&
-        !nextOtherOrgObj
+        (!nextOtherOrgObj || nextOtherOrgObj.length == 0)
       ) {
         return this.$message.warning('请选择处理对象!');
       } else if (
         isHideCurrentOrg == 0 &&
-        !nextOtherOrgObj &&
-        !nextCurrentOrgObj
+        (!nextOtherOrgObj || nextOtherOrgObj.length == 0) &&
+        (!nextCurrentOrgObj || nextCurrentOrgObj.length == 0)
       ) {
         return this.$message.warning('请选择处理对象!');
       }
@@ -506,6 +588,7 @@ export default {
         data: {
           opinion,
           pendingId,
+
           nextOtherOrgObj:
             this.type == 'unionSeal'
               ? this.unionSealData.map((x) => x.showid).join(',')
@@ -524,6 +607,11 @@ export default {
         headers: { Accept: 'application/json,text/plain' },
         method: 'POST'
       };
+      if (this.enableCustomLimitTimeSetting) {
+        param.data.customLimitTime = customLimitTime;
+        console.log(this.validate(),'this.validate()')
+        if (!this.validate()) return;
+      }
       this.loading = true;
       util
         .ajax(param)