eoss-ui 0.4.94 → 0.4.96

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

@@ -1 +1 @@
-@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
+@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}

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

@@ -83,6 +83,13 @@
       .el-input__inner {
         width: 100%;
         max-width: 156px;
+        &.el-date-editor--daterange {
+          max-width: 300px;
+          .el-input__icon,
+          .el-range-separator {
+            line-height: 24px;
+          }
+        }
       }
     }
   }

package/src/index.js

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

package/src/utils/util.js

@@ -448,7 +448,7 @@ const arrUnique = function (data, key) {
  * @param {...number} numbers - 一组数字
  * @return {number} 数组中数字的平均值
  **/
-const average = function(...numbers) {
+const average = function (...numbers) {
   // Ensure that all arguments are valid numbers
   if (!numbers.every(Number.isFinite)) {
     throw new Error('Invalid input. Please provide valid numbers.');
@@ -485,7 +485,7 @@ const browser = function () {
  * @param {Array<string>} holidays - 假期日期字符串数组，格式为 "YYYY-MM-DD"
  * @return {number} 工作日天数
  **/
-const calculateNetworkDays = function(start_date, end_date, holidays = []) {
+const calculateNetworkDays = function (start_date, end_date, holidays = []) {
   if (typeof start_date !== 'string' || typeof end_date !== 'string') {
     throw new Error("Invalid input. Please provide valid date strings in the format 'YYYY-MM-DD'.");
   }
@@ -533,7 +533,7 @@ const calculateNetworkDays = function(start_date, end_date, holidays = []) {
  * @param {...string} strings - 多个文本字符串
  * @return {string} 合并后的字符串
  **/
-const concatenate = function(separator, ...strings) {
+const concatenate = function (separator, ...strings) {
   if (typeof separator !== 'string' || !strings.every(str => typeof str === 'string')) {
     throw new Error('Invalid input. Please provide a valid separator and valid strings.');
   }
@@ -548,7 +548,7 @@ const concatenate = function(separator, ...strings) {
  * @param {number} days - 要加上或减去的天数，正数表示加，负数表示减
  * @return {string} 计算后的日期字符串
  **/
-const dateAddDays = function(start_date, days) {
+const dateAddDays = function (start_date, days) {
   if (typeof start_date !== 'string' || !Number.isInteger(days)) {
     throw new Error("Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD' and a valid integer for the number of days.");
   }
@@ -578,7 +578,7 @@ const dateAddDays = function(start_date, days) {
  * @param {String} [unit] - 计算的时间单位 ("y", "M", "d", "h", "m", "s")
  * @return {Number} 两个日期之间的差距
  **/
-const dateDiff = function(start_date, end_date, unit) {
+const dateDiff = function (start_date, end_date, unit) {
   // Assuming date strings are in "YYYY-MM-DD" format
   var startDate = new Date(start_date);
   var endDate = new Date(end_date);
@@ -614,7 +614,7 @@ const dateDiff = function(start_date, end_date, unit) {
  * @param {string} date - 日期字符串，格式为 "YYYY-MM-DD"
  * @return {number} 当月的第几天
  **/
-const dayOfMonth = function(date) {
+const dayOfMonth = function (date) {
   if (typeof date !== 'string') {
     throw new Error("Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD'.");
   }
@@ -651,22 +651,42 @@ const debounce = function (callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 const delUrlParam = function ({ url, key }) {
   let src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   let param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    let reg = `${key}=${param[key]}`;
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(item => {
+        if (param.hasOwnProperty(item)) {
+          let reg = `${item}=${param[item]}`;
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        let reg = `${key}=${param[key]}`;
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1069,7 +1089,7 @@ const getHue = function ($h, $i, $isLight) {
  * @desc 返回当前日期
  * @return {string} 当前日期字符串，格式为 "YYYY-MM-DD"
  **/
-const getCurrentDate = function() {
+const getCurrentDate = function () {
   const today = new Date();
 
   const year = today.getFullYear();
@@ -1085,7 +1105,7 @@ const getCurrentDate = function() {
  * @desc 返回当前日期和时间
  * @return {string} 当前日期和时间字符串，格式为 "YYYY-MM-DD HH:mm:ss"
  **/
-const getCurrentDateTime = function() {
+const getCurrentDateTime = function () {
   const currentDateTime = new Date();
 
   const year = currentDateTime.getFullYear();
@@ -1105,7 +1125,7 @@ const getCurrentDateTime = function() {
  * @param {string} datetime - 日期时间字符串，格式为 "YYYY-MM-DD HH:mm:ss"
  * @return {number} 给定日期或时间的小时部分
  **/
-const getHour = function(datetime) {
+const getHour = function (datetime) {
   if (typeof datetime !== 'string') {
     throw new Error("Invalid input. Please provide a valid datetime string in the format 'YYYY-MM-DD HH:mm:ss'.");
   }
@@ -1126,7 +1146,7 @@ const getHour = function(datetime) {
  * @param {number} type - 可选参数，表示周的起始日，0 表示星期天，1 表示星期一，以此类推，默认为 0
  * @return {number} 给定日期属于所在年的第几周
  **/
-const getWeekNumber = function(date, type = 1) {
+const getWeekNumber = function (date, type = 1) {
   if (typeof date !== 'string') {
     throw new Error("Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD'.");
   }
@@ -1163,7 +1183,7 @@ const getWeekNumber = function(date, type = 1) {
  * @param {string} text - 要计算字符个数的文本字符串
  * @return {number} 文本字符串的字符个数
  **/
-const getLength = function(text) {
+const getLength = function (text) {
   if (typeof text !== 'string') {
     throw new Error('Invalid input. Please provide a valid text string.');
   }
@@ -1192,7 +1212,7 @@ const getLightness = function ($v, $i, $isLight) {
  * @param {string} datetime - 日期时间字符串，格式为 "YYYY-MM-DD HH:mm:ss"
  * @return {number} 给定日期或时间的分钟部分
  **/
-const getMinute = function(datetime) {
+const getMinute = function (datetime) {
   if (typeof datetime !== 'string') {
     throw new Error("Invalid input. Please provide a valid datetime string in the format 'YYYY-MM-DD HH:mm:ss'.");
   }
@@ -1212,7 +1232,7 @@ const getMinute = function(datetime) {
  * @param {string} date - 日期字符串，格式为 "YYYY-MM-DD"
  * @return {number} 给定日期的月份
  **/
-const getMonth = function(date) {
+const getMonth = function (date) {
   if (typeof date !== 'string') {
     throw new Error("Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD'.");
   }
@@ -1432,7 +1452,7 @@ const getScript = function (url, callback) {
  * @param {string} datetime - 日期时间字符串，格式为 "YYYY-MM-DD HH:mm:ss"
  * @return {number} 给定日期或时间的秒钟部分
  **/
-const getSecond = function(datetime) {
+const getSecond = function (datetime) {
   if (typeof datetime !== 'string') {
     throw new Error("Invalid input. Please provide a valid datetime string in the format 'YYYY-MM-DD HH:mm:ss'.");
   }
@@ -1638,7 +1658,7 @@ const getValues = function (obj, flag) {
  * @param {number} type - 可选参数，表示星期的起始日，0 表示星期天，1 表示星期一，以此类推，默认为 0
  * @return {number} 给定日期是所在星期的第几天
  **/
-const getWeekday = function(date, type = 0) {
+const getWeekday = function (date, type = 0) {
   if (typeof date !== 'string') {
     throw new Error("Invalid input. Please provide a valid date string in the format 'YYYY-MM-DD'.");
   }
@@ -1863,17 +1883,17 @@ const isLogined = function ({
   if (logined || cookie == true || cookie == 1) {
     if (loginPage) {
       sessionStorage.setItem('loginPage', loginPage);
-        if (!startWith(loginPage, ['http', '/'], true)) {
-          let pathname = win.top.location.pathname;
-          if (pathname !== '/') {
-            pathname = pathname.split('/');
-            pathname.splice(pathname.length - 1);
-            pathname = pathname.join('/');
-            loginPage = pathname + '/' + loginPage.replace('./', '');
-          } else {
-            loginPage = pathname + loginPage.replace('./', '');
-          }
+      if (!startWith(loginPage, ['http', '/'], true)) {
+        let pathname = win.top.location.pathname;
+        if (pathname !== '/') {
+          pathname = pathname.split('/');
+          pathname.splice(pathname.length - 1);
+          pathname = pathname.join('/');
+          loginPage = pathname + '/' + loginPage.replace('./', '');
+        } else {
+          loginPage = pathname + loginPage.replace('./', '');
         }
+      }
     }
     next();
   } else {
@@ -1882,20 +1902,6 @@ const isLogined = function ({
       !token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') &&
       Object.prototype.hasOwnProperty.call(to.query, 'authType')
     ) {
-      let url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: authCenter,
@@ -1922,6 +1928,7 @@ const isLogined = function ({
             case 2:
               break;
             case 3:
+              let url = win.top.location.href;
               const href = results.authorizeUrl.replace(
                 '{redirectUri}',
                 encodeURIComponent(url)
@@ -2154,7 +2161,7 @@ const loading = function ($loading, res) {
  * @param {string} text - 要转换的文本字符串
  * @return {string} 转换为小写字母后的字符串
  **/
-const lowerCase = function(text) {
+const lowerCase = function (text) {
   if (typeof text !== 'string') {
     throw new Error('Invalid input. Please provide a valid text string.');
   }
@@ -2322,7 +2329,7 @@ const rgbToHsv = function ($color) {
  * @param {number} number - 人民币金额
  * @return {string} 人民币大写形式
  **/
-const rmbToCapital = function(number) {
+const rmbToCapital = function (number) {
   if (!Number.isFinite(number)) {
     throw new Error('Invalid input. Please provide a valid number for the RMB amount.');
   }
@@ -2523,7 +2530,7 @@ const startWith = function (value, reg, or = true) {
  * @param {number} num_chars - 要返回的字符数量
  * @return {string} 从左侧提取的字符
  **/
-const takeLeft = function(text, num_chars) {
+const takeLeft = function (text, num_chars) {
   if (typeof text !== 'string' || !Number.isInteger(num_chars) || num_chars < 0) {
     throw new Error('Invalid input. Please provide a valid text string and a non-negative integer for the number of characters.');
   }
@@ -2539,7 +2546,7 @@ const takeLeft = function(text, num_chars) {
  * @param {number} num_chars - 要返回的字符数量
  * @return {string} 从右侧提取的字符
  **/
-const takeRight = function(text, num_chars) {
+const takeRight = function (text, num_chars) {
   if (typeof text !== 'string' || !Number.isInteger(num_chars) || num_chars < 0) {
     throw new Error('Invalid input. Please provide a valid text string and a non-negative integer for the number of characters.');
   }
@@ -2600,7 +2607,7 @@ const timeCycle = function (date) {
  * @param {string} text - 要处理的文本字符串
  * @return {string} 删除首尾空格后的字符串
  **/
-const trimWhitespace = function(text) {
+const trimWhitespace = function (text) {
   if (typeof text !== 'string') {
     throw new Error('Invalid input. Please provide a valid text string.');
   }
@@ -2691,7 +2698,7 @@ const updateTheme = function ($color, send) {
  * @param {string} text - 要转换的文本字符串
  * @return {string} 转换为大写字母后的字符串
  **/
-const upperCase = function(text) {
+const upperCase = function (text) {
   if (typeof text !== 'string') {
     throw new Error('Invalid input. Please provide a valid text string.');
   }
@@ -2755,7 +2762,7 @@ const uuid = function (len) {
  **/
 const watermark = function (option) {
   // 默认设置
-  let _width = parseInt(option.width || 480, 10) ;
+  let _width = parseInt(option.width || 480, 10);
   let _height = parseInt(option.width || 180, 10);
   let _rows = Math.round(document.body.clientHeight / _height);
   let _cols = Math.round(document.body.clientWidth / _width);