eoss-ui 0.7.19 → 0.7.21

package/packages/theme-chalk/src/flow.scss

@@ -267,7 +267,10 @@
 }
 .custom-limit-time .el-input.el-input--suffix{
   width: calc(100% + 40px) !important;
-} 
+}
+.task-union-examine .custom-limit-time .el-input.el-input--suffix{
+  width: unset !important;
+}
 .custom-limit-time .el-input-group__append{
   background-color: $--color-primary !important;
   color: #fff !important;

package/packages/tree/src/main.vue

@@ -408,7 +408,7 @@ export default {
     },
     //获取树节点
     getTreeDatas(param) {
-      let params = util.extend({}, this.param, this.where, param || {});
+      let params = util.extend({}, this.param, param || {}, this.where);
       if (!this.url || !this.isRemote) return;
       this.loading = true;
       util

package/src/index.js

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

package/src/utils/util.js

@@ -75,6 +75,7 @@ const ajax = function ({
   formatConfig = {},
   mix = false,
   defaults = false,
+  withCredentials = true,
   loading,
   publicKey,
   secret,
@@ -127,47 +128,18 @@ const ajax = function ({
           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
-            );
-          }
+        const 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);
@@ -1759,45 +1731,6 @@ const getSecond = function (datetime) {
   return datetimeObj.getSeconds();
 };
 
-/**
- * getStorage
- * @desc:获取本地储存数据
- * @author huangbo
- * @date 2022年5月7日
- * @param {String} [key] - 获取的名称
- **/
-const getStorage = function (key) {
-  if (key) {
-    let res =
-      sessionStorage.getItem(key) || localStorage.getItem(key) || win[key];
-    if (key === 'host' && !res) {
-      return win.location.origin;
-    }
-    return res;
-  }
-  let defaults = {};
-  const token =
-    sessionStorage.getItem('token') ||
-    localStorage.getItem('token') ||
-    win.token;
-  const ssId =
-    sessionStorage.getItem('ssId') || localStorage.getItem('ssId') || win.ssId;
-  const 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:获取元素样式（含非行内样式）
@@ -2319,9 +2252,7 @@ const isLogined = async function ({
             let { results } = res;
             switch (results.statusCode) {
               case 0:
-                const storage = getStorage('storage');
                 setStorage({
-                  type: storage,
                   key: {
                     ssId: results.ssId,
                     token: results.token,
@@ -2721,28 +2652,6 @@ const receiveMessage = function ({ data = {}, url, callback }) {
   });
 };
 
-/**
- * removeStorage
- * @desc:删除本地储存数据
- * @author huangbo
- * @date 2022年5月7日
- * @param {String, Array} [key] - 获取的名称
- **/
-const removeStorage = function (key) {
-  if (Array.isArray(key)) {
-    for (let 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:补全小数位数
@@ -3091,48 +3000,6 @@ const setFavicon = function (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] - 数据的值
- **/
-const setStorage = function ({ type, key, value }) {
-  if (value && typeof value === 'object') {
-    value = JSON.stringify(value);
-  }
-  if (type === 'localStorage') {
-    if (typeof key === 'string') {
-      localStorage.setItem(key, value);
-    } else if (Array.isArray(key)) {
-      for (let i in key) {
-        localStorage.setItem(key[i], value);
-      }
-    } else {
-      for (let i in key) {
-        let val = typeof key[i] === 'object' ? JSON.stringify(key[i]) : key[i];
-        localStorage.setItem(i, val);
-      }
-    }
-  } else {
-    if (typeof key === 'string') {
-      sessionStorage.setItem(key, value);
-    } else if (Array.isArray(key)) {
-      for (let i in key) {
-        sessionStorage.setItem(key[i], value);
-      }
-    } else {
-      for (let i in key) {
-        let val = typeof key[i] === 'object' ? JSON.stringify(key[i]) : key[i];
-        sessionStorage.setItem(i, val);
-      }
-    }
-  }
-};
-
 /**
  * socket
  * @desc:webSocket
@@ -3556,6 +3423,183 @@ const watermark = function (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] - 数据的值
+ **/
+const setStorage = function ({ type, key, value }) {
+  type = type || getStorage('storage');
+
+  if (value && 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 (let i in key) {
+        localStorage.setItem(key[i], value);
+        if (key[i] === 'token') {
+          setCookie('token', value);
+        }
+      }
+    } else {
+      for (let i in key) {
+        let val = typeof key[i] === 'object' ? JSON.stringify(key[i]) : key[i];
+        localStorage.setItem(i, val);
+        if (i === '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 (let i in key) {
+        sessionStorage.setItem(key[i], value);
+        if (key[i] === 'token') {
+          setCookie('token', value);
+        }
+      }
+    } else {
+      for (let i in key) {
+        let val = typeof key[i] === 'object' ? JSON.stringify(key[i]) : key[i];
+        sessionStorage.setItem(i, val);
+        if (i === 'token') {
+          setCookie('token', val);
+        }
+      }
+    }
+  }
+};
+
+/**
+ * getStorage
+ * @desc:获取本地储存数据
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [key] - 获取的名称
+ **/
+const getStorage = function (key) {
+  if (key) {
+    let res =
+      sessionStorage.getItem(key) || localStorage.getItem(key) || win[key];
+    if (key === 'host' && !res) {
+      return win.location.origin;
+    }
+    return res;
+  }
+  let defaults = {};
+  const token =
+    sessionStorage.getItem('token') ||
+    localStorage.getItem('token') || getCookie('token') ||
+    win.token;
+  const ssId =
+    sessionStorage.getItem('ssId') || localStorage.getItem('ssId') || getCookie('ssId') || win.ssId;
+
+  const 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] - 获取的名称
+ **/
+const removeStorage = function (key) {
+  if (Array.isArray(key)) {
+    for (let 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值
+ **/
+const setCookie = function (name, value) {
+  // 不设置 expires 或 max-age，默认为会话 Cookie
+  document.cookie = `${encodeURIComponent(name)}=${encodeURIComponent(value)}; path=/`;
+};
+
+/**
+ * getCookie
+ * @desc 获取cookie中指定名称的值
+ * @author huangbo
+ * @param {string} [name] cookie名称
+ **/
+const getCookie = function (name) {
+  const cookies = document.cookie.split(';');
+  for (const cookie of cookies) {
+    const [cookieName, cookieValue] = cookie.trim().split('=');
+    if (decodeURIComponent(cookieName) === name) {
+      return decodeURIComponent(cookieValue);
+    }
+  }
+  return null;
+};
+
+/**
+ * removeCookie
+ * @desc:删除cookie
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String, Array} [key] - 获取的名称
+ **/
+const removeCookie = function (key) {
+  if (Array.isArray(key)) {
+    for (let 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=/;`;
+  }
+};
+
 export default {
   ajax,
   ajaxStream,
@@ -3582,6 +3626,7 @@ export default {
   formatDate,
   getCurrentDate,
   getCurrentDateTime,
+  getCookie,
   getHour,
   getMyWinTop,
   getWeekNumber,
@@ -3619,6 +3664,7 @@ export default {
   mixColor,
   overbrim,
   queryParams,
+  removeCookie,
   receiveMessage,
   removeStorage,
   replenish,
@@ -3626,6 +3672,7 @@ export default {
   rgbToHsv,
   rmbToCapital,
   sendMessage,
+  setCookie,
   setFavicon,
   setScale,
   setStorage,